Revert "Roll ANGLE from b36e337e8d94 to 3bd0cce8d0c4 (15 revisions)"

This reverts commit e6a0057602c5f772068e4d1351a73e597985c9d2.

Reason for revert: Is causing build breakages

Change-Id: I03208f27d1da44f94fea36b799648a34b289e41b
diff --git a/Android.bp b/Android.bp
index 3d04902..35a9860 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,7 +44,7 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -109,7 +109,7 @@
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_USE_EGL_LOADER",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DEGL_EGLEXT_PROTOTYPES",
         "-DEGL_EGL_PROTOTYPES=1",
@@ -210,7 +210,7 @@
         "-DANGLE_VMA_VERSION=2003000",
         "-DANGLE_VULKAN_SECONDARIES_EGL_LIBRARY_NAME=\"libEGL_vulkan_secondaries_angle\"",
         "-DANGLE_VULKAN_SECONDARIES_GLESV2_LIBRARY_NAME=\"libGLESv2_vulkan_secondaries_angle\"",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DEGLAPI=__attribute__((visibility(\"default\")))",
         "-DEGL_EGLEXT_PROTOTYPES",
@@ -299,7 +299,7 @@
         "-DANGLE_ENABLE_SHARE_CONTEXT_LOCK=1",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DEGL_EGLEXT_PROTOTYPES",
         "-DEGL_EGL_PROTOTYPES=1",
@@ -350,7 +350,7 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -408,7 +408,7 @@
         "-DANGLE_SHARED_LIBVULKAN=1",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -485,7 +485,7 @@
         "-DANGLE_USE_ABSEIL",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -551,7 +551,7 @@
         "-DANGLE_USE_ABSEIL",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -611,7 +611,7 @@
         "-DANGLE_USE_ABSEIL",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DLIBANGLE_IMPLEMENTATION",
@@ -741,7 +741,7 @@
         "-DANGLE_USE_CUSTOM_VULKAN_OUTSIDE_RENDER_PASS_CMD_BUFFERS=1",
         "-DANGLE_USE_CUSTOM_VULKAN_RENDER_PASS_CMD_BUFFERS=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DLIBANGLE_IMPLEMENTATION",
@@ -1063,7 +1063,7 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -1131,7 +1131,6 @@
         "third_party/vulkan-deps/spirv-tools/src/source/val/validate_primitives.cpp",
         "third_party/vulkan-deps/spirv-tools/src/source/val/validate_ray_query.cpp",
         "third_party/vulkan-deps/spirv-tools/src/source/val/validate_ray_tracing.cpp",
-        "third_party/vulkan-deps/spirv-tools/src/source/val/validate_ray_tracing_reorder.cpp",
         "third_party/vulkan-deps/spirv-tools/src/source/val/validate_scopes.cpp",
         "third_party/vulkan-deps/spirv-tools/src/source/val/validate_small_type_uses.cpp",
         "third_party/vulkan-deps/spirv-tools/src/source/val/validate_type.cpp",
@@ -1171,7 +1170,7 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -1231,7 +1230,7 @@
         "-DANGLE_USE_ABSEIL",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -1265,7 +1264,7 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -1299,7 +1298,7 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -1348,7 +1347,7 @@
         "-DANGLE_USE_ABSEIL",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -1405,7 +1404,7 @@
         "-DANGLE_USE_ABSEIL",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -1468,7 +1467,7 @@
         "-DANGLE_USE_ABSEIL",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -1664,7 +1663,7 @@
         "-DANGLE_USE_ABSEIL",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -1716,7 +1715,7 @@
         "-DANGLE_ENABLE_SHARE_CONTEXT_LOCK=1",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -1761,7 +1760,7 @@
         "-DANGLE_ENABLE_SHARE_CONTEXT_LOCK=1",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -1810,7 +1809,7 @@
         "-DANGLE_USE_ABSEIL",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -1869,7 +1868,7 @@
         "-DANGLE_USE_ABSEIL",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -1903,7 +1902,7 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -1943,7 +1942,7 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -1985,7 +1984,7 @@
         "-DANGLE_SHARED_LIBVULKAN=1",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -2044,7 +2043,7 @@
         "-DANGLE_VK_LAYERS_DIR=\"angledata\"",
         "-DANGLE_VK_MOCK_ICD_JSON=\"angledata/VkICD_mock_icd.json\"",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -2097,7 +2096,7 @@
         "-DANGLE_USE_ABSEIL",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -2159,7 +2158,7 @@
         "-DANGLE_USE_ABSEIL",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -2194,7 +2193,7 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -2256,7 +2255,7 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -2322,7 +2321,7 @@
                 "-DANDROID_NDK_VERSION_ROLL=r23_1",
                 "-DARMV8_OS_ANDROID",
                 "-DCRC32_ARMV8_CRC32",
-                "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+                "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
                 "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
                 "-DHAVE_SYS_UIO_H",
                 "-DNDEBUG",
@@ -2356,7 +2355,7 @@
                 "-DANDROID_NDK_VERSION_ROLL=r23_1",
                 "-DARMV8_OS_ANDROID",
                 "-DCRC32_ARMV8_CRC32",
-                "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+                "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
                 "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
                 "-DHAVE_SYS_UIO_H",
                 "-DNDEBUG",
@@ -2396,7 +2395,7 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -2433,7 +2432,7 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -2494,7 +2493,7 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -2555,7 +2554,7 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -2640,7 +2639,7 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -2835,7 +2834,7 @@
         "-DANGLE_USE_ABSEIL",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DLIBANGLE_IMPLEMENTATION",
@@ -2874,7 +2873,7 @@
         "-DANGLE_ENABLE_SHARE_CONTEXT_LOCK=1",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -2914,7 +2913,7 @@
         "-DANGLE_ENABLE_SHARE_CONTEXT_LOCK=1",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -2956,7 +2955,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -2996,7 +2995,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3045,7 +3044,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3082,7 +3081,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3119,7 +3118,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3157,7 +3156,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3195,7 +3194,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3232,7 +3231,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3285,7 +3284,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3324,7 +3323,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3361,7 +3360,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3416,7 +3415,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3453,7 +3452,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3494,7 +3493,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3531,7 +3530,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3569,7 +3568,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3618,7 +3617,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3658,7 +3657,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3710,7 +3709,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3749,7 +3748,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3794,7 +3793,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3836,7 +3835,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3884,7 +3883,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3929,7 +3928,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -3987,7 +3986,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -4030,7 +4029,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -4076,7 +4075,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -4119,7 +4118,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -4171,7 +4170,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -4212,7 +4211,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -4255,7 +4254,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -4297,7 +4296,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -4355,7 +4354,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -4395,7 +4394,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -4436,7 +4435,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -4478,7 +4477,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -4540,7 +4539,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -4581,7 +4580,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -4623,7 +4622,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -4664,7 +4663,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -4707,7 +4706,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -4753,7 +4752,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -4817,7 +4816,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -4859,7 +4858,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -4897,7 +4896,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -4940,7 +4939,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -4982,7 +4981,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5021,7 +5020,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5058,7 +5057,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5099,7 +5098,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5142,7 +5141,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5184,7 +5183,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5221,7 +5220,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5265,7 +5264,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5306,7 +5305,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5344,7 +5343,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5382,7 +5381,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5420,7 +5419,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5473,7 +5472,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5512,7 +5511,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5564,7 +5563,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5604,7 +5603,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5642,7 +5641,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5681,7 +5680,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5719,7 +5718,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5759,7 +5758,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5796,7 +5795,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5833,7 +5832,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5869,7 +5868,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5906,7 +5905,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5945,7 +5944,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -5987,7 +5986,7 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -6074,7 +6073,7 @@
         "-DANGLE_USE_ABSEIL",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -6127,7 +6126,7 @@
         "-DANGLE_USE_ABSEIL",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DLIBANGLE_IMPLEMENTATION",
@@ -6183,7 +6182,7 @@
         "-DANGLE_USE_ABSEIL",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DLIBANGLE_IMPLEMENTATION",
@@ -6272,7 +6271,7 @@
         "-DANGLE_USE_CUSTOM_VULKAN_OUTSIDE_RENDER_PASS_CMD_BUFFERS=1",
         "-DANGLE_USE_CUSTOM_VULKAN_RENDER_PASS_CMD_BUFFERS=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DLIBANGLE_IMPLEMENTATION",
@@ -6311,7 +6310,7 @@
         "-DANGLE_ENABLE_SHARE_CONTEXT_LOCK=1",
         "-DANGLE_USE_ANDROID_TLS_SLOT=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -6415,7 +6414,7 @@
         "-DANGLE_USE_CUSTOM_VULKAN_OUTSIDE_RENDER_PASS_CMD_BUFFERS=1",
         "-DANGLE_USE_CUSTOM_VULKAN_RENDER_PASS_CMD_BUFFERS=1",
         "-DANGLE_VMA_VERSION=2003000",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-2\"",
+        "-DCR_CLANG_REVISION=\"llvmorg-16-init-12251-g87d0ff91-1\"",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DEGL_EGLEXT_PROTOTYPES",
         "-DEGL_EGL_PROTOTYPES=1",
diff --git a/DEPS b/DEPS
index ca65ac7..1d7dc06 100644
--- a/DEPS
+++ b/DEPS
@@ -43,13 +43,13 @@
   'checkout_angle_mesa': False,
 
   # Version of Chromium our Chromium-based DEPS are mirrored from.
-  'chromium_revision': '6a123e5dfc29628da3dc3e4ca80efd08c8eaa95f',
+  'chromium_revision': '5d807d6fc7dd5529de62210ad088c66aef55867c',
   # We never want to checkout chromium,
   # but need a dummy DEPS entry for the autoroller
   'dummy_checkout_chromium': False,
 
   # Current revision of VK-GL-CTS (a.k.a dEQP).
-  'vk_gl_cts_revision': 'd90c76e77622829193e18e8f22eb945e8c07a5a4',
+  'vk_gl_cts_revision': '9d22258ed442f96af44dc8aa8fcf92a60ab34747',
 
   # Current revision of googletest.
   # Note: this dep cannot be auto-rolled b/c of nesting.
@@ -88,7 +88,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling catapult
   # and whatever else without interference from each other.
-  'catapult_revision': 'd8be2db85803e8693c4bf82bca39b4622be29da0',
+  'catapult_revision': '550c7afb520bc3f3197f66c8d018a73e29f3ad66',
 
   # the commit queue can handle CLs rolling Fuchsia sdk
   # and whatever else without interference from each other.
@@ -136,12 +136,12 @@
 deps = {
 
   'build': {
-    'url': '{chromium_git}/chromium/src/build.git@d286aa4250f1712ef8180d76226c6a83169be222',
+    'url': '{chromium_git}/chromium/src/build.git@d5942868d8db2c03a17b71f8670cf23807a47c15',
     'condition': 'not build_with_chromium',
   },
 
   'buildtools': {
-    'url': '{chromium_git}/chromium/src/buildtools.git@d1379d3f07eaf4f8797b5f62136608e22c17a3bc',
+    'url': '{chromium_git}/chromium/src/buildtools.git@fdc7c139836f14b57dc1c3d9db54406f353ce217',
     'condition': 'not build_with_chromium',
   },
 
@@ -173,17 +173,17 @@
   },
 
   'buildtools/third_party/libc++/trunk': {
-    'url': '{chromium_git}/external/github.com/llvm/llvm-project/libcxx.git@8e000798006200a3e4bb9a5c372daf92648479c0',
+    'url': '{chromium_git}/external/github.com/llvm/llvm-project/libcxx.git@2dda3c5c1b8e6beda9745328fdfdc3953b326d6e',
     'condition': 'not build_with_chromium',
   },
 
   'buildtools/third_party/libc++abi/trunk': {
-    'url': '{chromium_git}/external/github.com/llvm/llvm-project/libcxxabi.git@f46bba92c0a967f8c538f0763f9167a3ee4d06f5',
+    'url': '{chromium_git}/external/github.com/llvm/llvm-project/libcxxabi.git@44d54baf424cfcfdd2fa6dab88cb5e536d7d81af',
     'condition': 'not build_with_chromium',
   },
 
   'buildtools/third_party/libunwind/trunk': {
-    'url': '{chromium_git}/external/github.com/llvm/llvm-project/libunwind.git@2b51e6f1ec5fe7ebf61d4725eef4607accdeab64',
+    'url': '{chromium_git}/external/github.com/llvm/llvm-project/libunwind.git@fd49ee4ee904ff6b65fc76ba2448a370873255e3',
     'condition': 'not build_with_chromium',
   },
 
@@ -199,7 +199,7 @@
   },
 
   'testing': {
-    'url': '{chromium_git}/chromium/src/testing@af35c6055bfa058a113a497d2ee1d9a251831ffc',
+    'url': '{chromium_git}/chromium/src/testing@952f26fb1117b31591cb83356431786109e8ba80',
     'condition': 'not build_with_chromium',
   },
 
@@ -372,7 +372,7 @@
   },
 
   'third_party/depot_tools': {
-    'url': '{chromium_git}/chromium/tools/depot_tools.git@25334bb18e549fef8c1516ac270e9bbfa3fd655b',
+    'url': '{chromium_git}/chromium/tools/depot_tools.git@ec1882fbc24e603f5b35b81739f2ae1541d3b9bb',
     'condition': 'not build_with_chromium',
   },
 
@@ -569,7 +569,7 @@
       'packages': [
           {
               'package': 'chromium/third_party/r8',
-              'version': '0SzbA94FRVtzsELRN30my7jJQTeHVH65wHSU1JF2bQMC',
+              'version': 'FNMbaJ4o3bVeGVnIwu9D0VSqXEZIi5v2LV9ycHFpqrkC',
           },
       ],
       'condition': 'checkout_android and not build_with_chromium',
@@ -605,7 +605,7 @@
   },
 
   'third_party/SwiftShader': {
-    'url': '{swiftshader_git}/SwiftShader@2783f6bf0a039b60b0869a7c2e2da2dfa2b7e0a5',
+    'url': '{swiftshader_git}/SwiftShader@6a259c87ef52ffbcdca88c32a5e5f2798f70ad03',
     'condition': 'not build_with_chromium',
   },
 
@@ -613,7 +613,7 @@
       'packages': [
           {
               'package': 'chromium/third_party/turbine',
-              'version': 'R-Qp1tMBqIuETMfXNqQU9GB00ij6dsPjVmjDuvH_194C',
+              'version': '4Cvss-AYlYPcW_PIdcX45Ew7ZQwsaeurs7mUjS3LFyQC',
           },
       ],
       'condition': 'checkout_android and not build_with_chromium',
@@ -625,7 +625,7 @@
   },
 
   'third_party/vulkan-deps': {
-    'url': '{chromium_git}/vulkan-deps@a497ee9d6755ad3c91643a33f1ccb7cb68fa441c',
+    'url': '{chromium_git}/vulkan-deps@ca8ca2aba961abe6cc3dfd6879dfc2687c765df8',
     'condition': 'not build_with_chromium',
   },
 
@@ -650,7 +650,7 @@
   },
 
   'tools/clang': {
-    'url': '{chromium_git}/chromium/src/tools/clang.git@9f615fd09602f27e4591986c87eeb2fc3b3e6617',
+    'url': '{chromium_git}/chromium/src/tools/clang.git@65848dccd6cb0c9224c8b2ae0dbe503820a1e10d',
     'condition': 'not build_with_chromium',
   },
 
@@ -681,7 +681,7 @@
   },
 
   'tools/mb': {
-    'url': '{chromium_git}/chromium/src/tools/mb@d9c9c23e0205567a00e7e98cdf9850b0c52e7826',
+    'url': '{chromium_git}/chromium/src/tools/mb@ea9a7de75840cdda2bbd6550850cf93e1ecee493',
     'condition': 'not build_with_chromium',
   },
 
@@ -696,7 +696,7 @@
   },
 
   'tools/perf': {
-    'url': '{chromium_git}/chromium/src/tools/perf@a5b1342192d761de8f814fb0485a14c2d1a0d0bd',
+    'url': '{chromium_git}/chromium/src/tools/perf@b1111b1e0a9ba6784672e2b79083e06830df9d82',
     'condition': 'not build_with_chromium',
   },
 
diff --git a/build/android/docs/java_toolchain.md b/build/android/docs/java_toolchain.md
index a9d229d..007eccd 100644
--- a/build/android/docs/java_toolchain.md
+++ b/build/android/docs/java_toolchain.md
@@ -30,23 +30,20 @@
 
 ### Step 1: Create interface .jar with turbine or ijar
 
+For prebuilt `.jar` files, use [//third_party/ijar] to create interface `.jar`
+from prebuilt `.jar`.
+
+For non-prebuilt targets, use [//third_party/turbine] to create interface `.jar`
+from `.java` source files. Turbine is much faster than javac, and so enables
+full compilation to happen more concurrently.
+
 What are interface jars?:
 
-* They contain `.class` files with all private symbols and all method bodies
+* The contain `.class` files with all non-public symbols and function bodies
   removed.
 * Dependant targets use interface `.jar` files to skip having to be rebuilt
   when only private implementation details change.
 
-For prebuilt `.jar` files: we use [//third_party/ijar] to create interface
-`.jar` files from the prebuilt ones.
-
-For non-prebuilt `.jar` files`: we use [//third_party/turbine] to create
-interface `.jar` files directly from `.java` source files. Turbine is faster
-than javac because it does not compile method bodies. Although Turbine causes
-us to compile files twice, it speeds up builds by allowing `javac` compilation
-of targets to happen concurrently with their dependencies. We also use Turbine
-to run our annotation processors.
-
 [//third_party/ijar]: /third_party/ijar/README.chromium
 [//third_party/turbine]: /third_party/turbine/README.chromium
 
diff --git a/build/android/list_java_targets.py b/build/android/list_java_targets.py
index 6f19be4..78e849a 100755
--- a/build/android/list_java_targets.py
+++ b/build/android/list_java_targets.py
@@ -105,45 +105,7 @@
   return ret
 
 
-def _query_json(*, json_dict: dict, query: str, path: str):
-  """Traverses through the json dictionary according to the query.
-
-  If at any point a key does not exist, return the empty string, but raise an
-  error if a key exists but is the wrong type.
-
-  This is roughly equivalent to returning
-  json_dict[queries[0]]?[queries[1]]?...[queries[N]]? where the ? means that if
-  the key doesn't exist, the empty string is returned.
-
-  Example:
-  Given json_dict = {'a': {'b': 'c'}}
-  - If queries = ['a', 'b']
-    Return: 'c'
-  - If queries = ['a', 'd']
-    Return ''
-  - If queries = ['x']
-    Return ''
-  - If queries = ['a', 'b', 'x']
-    Raise an error since json_dict['a']['b'] is the string 'c' instead of an
-    expected dict that can be indexed into.
-
-  Returns the final result after exhausting all the queries.
-  """
-  queries = query.split('.')
-  value = json_dict
-  try:
-    for key in queries:
-      value = value.get(key)
-      if value is None:
-        return ''
-  except AttributeError as e:
-    raise Exception(
-        f'Failed when attempting to get {queries} from {path}') from e
-  return value
-
-
 class _TargetEntry:
-
   def __init__(self, gn_target):
     assert gn_target.startswith('//'), f'{gn_target} does not start with //'
     assert ':' in gn_target, f'Non-root {gn_target} required'
@@ -221,19 +183,13 @@
                       help='Print counts of each target type.')
   parser.add_argument('--proguard-enabled',
                       action='store_true',
-                      help='Restrict to targets that have proguard enabled.')
-  parser.add_argument('--query',
-                      help='A dot separated string specifying a query for a '
-                      'build config json value of each target. Example: Use '
-                      '--query deps_info.unprocessed_jar_path to show a list '
-                      'of all targets that have a non-empty deps_info dict and '
-                      'non-empty "unprocessed_jar_path" value in that dict.')
+                      help='Restrict to targets that have proguard enabled')
   parser.add_argument('-v', '--verbose', default=0, action='count')
   parser.add_argument('-q', '--quiet', default=0, action='count')
   args = parser.parse_args()
 
   args.build |= bool(args.type or args.proguard_enabled or args.print_types
-                     or args.stats or args.query)
+                     or args.stats)
 
   logging.basicConfig(level=logging.WARNING + 10 * (args.quiet - args.verbose),
                       format='%(levelname).1s %(relativeCreated)6d %(message)s')
@@ -277,13 +233,6 @@
         to_print = f'{to_print}: {e.get_type()}'
       elif args.print_build_config_paths:
         to_print = f'{to_print}: {e.build_config_path}'
-      elif args.query:
-        value = _query_json(json_dict=e.build_config(),
-                            query=args.query,
-                            path=e.build_config_path)
-        if not value:
-          continue
-        to_print = f'{to_print}: {value}'
 
       print(to_print)
 
diff --git a/build/config/fuchsia/generate_runner_scripts.gni b/build/config/fuchsia/generate_runner_scripts.gni
index 66974f5..3d9ed5f 100644
--- a/build/config/fuchsia/generate_runner_scripts.gni
+++ b/build/config/fuchsia/generate_runner_scripts.gni
@@ -78,6 +78,11 @@
   } else {
     _pkg_shortname = get_label_info(invoker.package, "name")
   }
+  if (!defined(invoker.use_v2_script)) {
+    use_v2_script = use_v2_script_default
+  } else {
+    use_v2_script = invoker.use_v2_script
+  }
 
   _generated_script_path =
       "$root_build_dir/bin/" +
@@ -121,7 +126,7 @@
     }
 
     # Compute the list of full paths to package files, including dependencies.
-    if (!invoker.use_v2_script) {
+    if (!use_v2_script) {
       _pkg_dir = "$root_out_dir/gen/" + get_label_info(invoker.package, "dir") +
                  "/" + _pkg_shortname
       package_paths =
@@ -132,7 +137,7 @@
         package_dep_target = package_dep[0]
         deps += [ package_dep_target ]
         data_deps += [ package_dep_target ]
-        if (!invoker.use_v2_script) {
+        if (!use_v2_script) {
           package_dep_name = package_dep[1]
           package_dep_path = rebase_path(
                   get_label_info(package_dep_target, "target_gen_dir") + "/" +
@@ -148,7 +153,7 @@
       executable_args = []
     }
 
-    if (!invoker.use_v2_script) {
+    if (!use_v2_script) {
       foreach(package_path, package_paths) {
         executable_args += [
           "--package",
@@ -188,11 +193,6 @@
   } else {
     pkg_shortname = get_label_info(invoker.package, "name")
   }
-  if (!defined(invoker.use_v2_script)) {
-    use_v2_script = use_v2_script_default
-  } else {
-    use_v2_script = invoker.use_v2_script
-  }
   fuchsia_package_metadata(pkg_shortname) {
     forward_variables_from(invoker,
                            TESTONLY_AND_VISIBILITY + [
@@ -205,16 +205,7 @@
                            "*",
                            TESTONLY_AND_VISIBILITY + [ "executable_args" ])
     forward_variables_from(invoker, TESTONLY_AND_VISIBILITY)
-    if (use_v2_script) {
-      executable = rebase_path("//build/fuchsia/test/deploy_to_fuchsia.py")
-      executable_args = [
-        "--out-dir",
-        "@WrappedPath(.)",
-        pkg_shortname,
-      ]
-    } else {
-      executable = rebase_path("//build/fuchsia/deploy_to_pkg_repo.py")
-    }
+    executable = rebase_path("//build/fuchsia/deploy_to_pkg_repo.py")
     output_name_format = "deploy_%package%"
     include_fuchsia_build_dir = true
   }
diff --git a/build/fuchsia/deploy_to_pkg_repo.py b/build/fuchsia/deploy_to_pkg_repo.py
index a1945a6..f686fc5 100755
--- a/build/fuchsia/deploy_to_pkg_repo.py
+++ b/build/fuchsia/deploy_to_pkg_repo.py
@@ -27,11 +27,12 @@
   assert args.package
 
   fuchsia_out_dir = os.path.expanduser(args.fuchsia_out_dir)
-  assert os.path.exists(fuchsia_out_dir), \
+  fuchsia_amber_files_dir = os.path.join(fuchsia_out_dir, 'amber-files')
+  assert os.path.exists(fuchsia_amber_files_dir), \
      '{} not found, check that --fuchsia-out-dir points to a valid out dir.' \
-     ' eg. /path/to/fuchsia/out/default'.format(fuchsia_out_dir)
+     ' eg. /path/to/fuchsia/out/default'.format(fuchsia_amber_files_dir)
 
-  repo = pkg_repo.ExternalPkgRepo(fuchsia_out_dir,
+  repo = pkg_repo.ExternalPkgRepo(fuchsia_amber_files_dir,
                                   os.path.join(fuchsia_out_dir, '.build-id'))
   print('Installing packages and symbols in package repo %s...' %
         repo.GetPath())
diff --git a/build/fuchsia/pkg_repo.py b/build/fuchsia/pkg_repo.py
index e772db2..e91c5cf 100644
--- a/build/fuchsia/pkg_repo.py
+++ b/build/fuchsia/pkg_repo.py
@@ -8,14 +8,9 @@
 import os
 import shutil
 import subprocess
-import sys
 import tempfile
 import time
 
-sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__),
-                                             'test')))
-from compatible_utils import install_symbols
-
 # Maximum amount of time to block while waiting for "pm serve" to come up.
 _PM_SERVE_LISTEN_TIMEOUT_SECS = 10
 
@@ -211,13 +206,13 @@
   """Publishes packages to a package repository located and served externally
   (ie. located under a Fuchsia build directory and served by "fx serve"."""
 
-  def __init__(self, fuchsia_out_dir):
+  def __init__(self, pkg_root, symbol_root):
     super(PkgRepo, self).__init__()
 
-    self._fuchsia_out_dir = fuchsia_out_dir
-    self._pkg_root = os.path.join(fuchsia_out_dir, 'amber-files')
+    self._pkg_root = pkg_root
+    self._symbol_root = symbol_root
 
-    logging.info('Using existing package root: {}'.format(self._pkg_root))
+    logging.info('Using existing package root: {}'.format(pkg_root))
     logging.info('ATTENTION: This will not start a package server. ' +
                  'Please run "fx serve" manually.')
 
@@ -227,10 +222,32 @@
   def PublishPackage(self, package_path):
     super(ExternalPkgRepo, self).PublishPackage(package_path)
 
-    install_symbols((package_path), self._fuchsia_out_dir)
+    self._InstallSymbols(os.path.join(os.path.dirname(package_path), 'ids.txt'))
 
   def __enter__(self):
     return self
 
   def __exit__(self, type, value, tb):
     pass
+
+  def _InstallSymbols(self, package_path):
+    """Installs debug symbols for a packageinto the GDB-standard symbol
+    directory located at |self.symbol_root|."""
+
+    ids_txt_path = os.path.join(os.path.dirname(package_path), 'ids.txt')
+    for entry in open(ids_txt_path, 'r'):
+      build_id, binary_relpath = entry.strip().split(' ')
+      binary_abspath = os.path.abspath(
+          os.path.join(os.path.dirname(ids_txt_path), binary_relpath))
+      symbol_dir = os.path.join(self._symbol_root, build_id[:2])
+      symbol_file = os.path.join(symbol_dir, build_id[2:] + '.debug')
+
+      if not os.path.exists(symbol_dir):
+        os.makedirs(symbol_dir)
+
+      if os.path.islink(symbol_file) or os.path.exists(symbol_file):
+        # Clobber the existing entry to ensure that the symlink's target is
+        # up to date.
+        os.unlink(symbol_file)
+
+      os.symlink(os.path.relpath(binary_abspath, symbol_dir), symbol_file)
diff --git a/build/fuchsia/test/common.py b/build/fuchsia/test/common.py
index de0d9dd..aa9fda9 100644
--- a/build/fuchsia/test/common.py
+++ b/build/fuchsia/test/common.py
@@ -242,13 +242,12 @@
     """Ensure that all |packages| are installed on a device."""
 
     for package in packages:
-        resolve_cmd = [
-            '--', 'pkgctl', 'resolve',
-            'fuchsia-pkg://%s/%s' % (REPO_ALIAS, package)
-        ]
-        subprocess.run(get_ssh_prefix(get_ssh_address(target_id)) +
-                       resolve_cmd,
-                       check=True)
+        if package in _V1_PACKAGE_LIST:
+            resolve_v1_packages([package], target_id)
+        run_ffx_command(
+            ['component', 'reload', f'/core/ffx-laboratory:{package}'],
+            target_id,
+            check=False)
 
 
 def get_ssh_address(target_id: Optional[str]) -> str:
@@ -256,3 +255,17 @@
     return run_ffx_command(('target', 'get-ssh-address'),
                            target_id,
                            capture_output=True).stdout.strip()
+
+
+
+# TODO(crbug.com/1342460): Remove when Telemetry tests are using CFv2 packages.
+def resolve_v1_packages(packages: List[str], target_id: Optional[str]) -> None:
+    """Ensure that all cfv1 packages are installed on a device."""
+    for package in packages:
+        resolve_cmd = [
+            '--', 'pkgctl', 'resolve',
+            'fuchsia-pkg://%s/%s' % (REPO_ALIAS, package)
+        ]
+        subprocess.run(get_ssh_prefix(get_ssh_address(target_id)) +
+                       resolve_cmd,
+                       check=True)
diff --git a/build/fuchsia/test/compatible_utils.py b/build/fuchsia/test/compatible_utils.py
index 39b4664..d5cdc82 100644
--- a/build/fuchsia/test/compatible_utils.py
+++ b/build/fuchsia/test/compatible_utils.py
@@ -9,7 +9,7 @@
 import stat
 import subprocess
 
-from typing import Iterable, List, Optional, Tuple
+from typing import List, Optional, Tuple
 
 
 # File indicating version of an image downloaded to the host
@@ -129,33 +129,6 @@
     ]
 
 
-def install_symbols(package_paths: Iterable[str],
-                    fuchsia_out_dir: str) -> None:
-    """Installs debug symbols for a package into the GDB-standard symbol
-    directory located in fuchsia_out_dir."""
-
-    symbol_root = os.path.join(fuchsia_out_dir, '.build-id')
-    for path in package_paths:
-        package_dir = os.path.dirname(path)
-        ids_txt_path = os.path.join(package_dir, 'ids.txt')
-        with open(ids_txt_path, 'r') as f:
-            for entry in f:
-                build_id, binary_relpath = entry.strip().split(' ')
-                binary_abspath = os.path.abspath(
-                    os.path.join(package_dir, binary_relpath))
-                symbol_dir = os.path.join(symbol_root, build_id[:2])
-                symbol_file = os.path.join(symbol_dir, build_id[2:] + '.debug')
-                if not os.path.exists(symbol_dir):
-                    os.makedirs(symbol_dir)
-
-                if os.path.islink(symbol_file) or os.path.exists(symbol_file):
-                    # Clobber the existing entry to ensure that the symlink's
-                    # target is up to date.
-                    os.unlink(symbol_file)
-                os.symlink(os.path.relpath(binary_abspath, symbol_dir),
-                           symbol_file)
-
-
 # TODO(crbug.com/1279803): Until one can send files to the device when running
 # a test, filter files must be read from the test package.
 def map_filter_file_to_package_file(filter_file: str) -> str:
diff --git a/build/fuchsia/test/compatible_utils_unittests.py b/build/fuchsia/test/compatible_utils_unittests.py
index 88c570f..080cdda 100755
--- a/build/fuchsia/test/compatible_utils_unittests.py
+++ b/build/fuchsia/test/compatible_utils_unittests.py
@@ -263,34 +263,6 @@
                 os.path.join(tmp_dir, 'images-internal', 'chromebook-x64',
                              'workstation_eng'))
 
-    def test_install_symbols(self):
-        """Test |install_symbols|."""
-
-        with tempfile.TemporaryDirectory() as fuchsia_out_dir:
-            build_id = 'test_build_id'
-            symbol_file = os.path.join(fuchsia_out_dir, '.build-id',
-                                       build_id[:2], build_id[2:] + '.debug')
-            id_path = os.path.join(fuchsia_out_dir, 'ids.txt')
-            try:
-                binary_relpath = 'path/to/binary'
-                with open(id_path, 'w') as f:
-                    f.write(f'{build_id} {binary_relpath}')
-                compatible_utils.install_symbols([id_path], fuchsia_out_dir)
-                self.assertTrue(os.path.islink(symbol_file))
-                self.assertEqual(os.path.realpath(symbol_file),
-                                 os.path.join(fuchsia_out_dir, binary_relpath))
-
-                new_binary_relpath = 'path/to/new/binary'
-                with open(id_path, 'w') as f:
-                    f.write(f'{build_id} {new_binary_relpath}')
-                compatible_utils.install_symbols([id_path], fuchsia_out_dir)
-                self.assertTrue(os.path.islink(symbol_file))
-                self.assertEqual(
-                    os.path.realpath(symbol_file),
-                    os.path.join(fuchsia_out_dir, new_binary_relpath))
-            finally:
-                os.remove(id_path)
-
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/build/fuchsia/test/coveragetest.py b/build/fuchsia/test/coveragetest.py
index 6d8121a..4c779be 100755
--- a/build/fuchsia/test/coveragetest.py
+++ b/build/fuchsia/test/coveragetest.py
@@ -12,8 +12,8 @@
 import coverage  # pylint: disable=import-error
 
 COVERED_FILES = [
-    'compatible_utils.py', 'deploy_to_fuchsia.py', 'flash_device.py',
-    'log_manager.py', 'publish_package.py', 'serve_repo.py', 'test_server.py'
+    'flash_device.py', 'log_manager.py', 'publish_package.py', 'serve_repo.py',
+    'test_server.py', 'compatible_utils.py'
 ]
 
 
diff --git a/build/fuchsia/test/deploy_to_fuchsia.py b/build/fuchsia/test/deploy_to_fuchsia.py
deleted file mode 100755
index 41b92aa..0000000
--- a/build/fuchsia/test/deploy_to_fuchsia.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env vpython3
-# Copyright 2022 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-"""A script for deploying Chrome binaries to a Fuchsia checkout."""
-
-import argparse
-import os
-import sys
-
-from common import read_package_paths, register_common_args
-from compatible_utils import install_symbols
-from publish_package import publish_packages
-
-
-def register_fuchsia_args(parser: argparse.ArgumentParser) -> None:
-    """Register common arguments for deploying to Fuchsia."""
-
-    fuchsia_args = parser.add_argument_group(
-        'fuchsia', 'Arguments for working with Fuchsia checkout.')
-    fuchsia_args.add_argument('--fuchsia-out-dir',
-                              help='Path to output directory of a local '
-                              'Fuchsia checkout.')
-
-
-def main():
-    """Stand-alone program for deploying to the output directory of a local
-    Fuchsia checkout."""
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument('package', help='The package to deploy to Fuchsia.')
-    register_common_args(parser)
-    register_fuchsia_args(parser)
-    args = parser.parse_args()
-
-    fuchsia_out_dir = os.path.expanduser(args.fuchsia_out_dir)
-    package_paths = read_package_paths(args.out_dir, args.package)
-    publish_packages(package_paths, os.path.join(fuchsia_out_dir,
-                                                 'amber-files'))
-    install_symbols(package_paths, fuchsia_out_dir)
-
-
-if __name__ == '__main__':
-    sys.exit(main())
diff --git a/build/fuchsia/test/deploy_to_fuchsia_unittests.py b/build/fuchsia/test/deploy_to_fuchsia_unittests.py
deleted file mode 100755
index 7635b46..0000000
--- a/build/fuchsia/test/deploy_to_fuchsia_unittests.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env vpython3
-# Copyright 2022 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-"""File for testing deploy_to_fuchsia.py."""
-
-import os
-import unittest
-import unittest.mock as mock
-
-import deploy_to_fuchsia
-
-
-class DeployToFuchsiaTest(unittest.TestCase):
-    """Unittests for deploy_to_fuchsia.py."""
-
-    @mock.patch('deploy_to_fuchsia.read_package_paths', return_value=[])
-    @mock.patch('deploy_to_fuchsia.publish_packages')
-    @mock.patch('deploy_to_fuchsia.install_symbols')
-    def test_main(self, mock_install, mock_publish, mock_read) -> None:
-        """Tests |main|."""
-
-        test_package = 'test_package'
-        fuchsia_out_dir = 'out/fuchsia'
-        with mock.patch('sys.argv', [
-                'deploy_to_fuchsia.py', test_package, '-C', 'out/chromium',
-                '--fuchsia-out-dir', fuchsia_out_dir
-        ]):
-            deploy_to_fuchsia.main()
-            self.assertEqual(mock_read.call_args_list[0][0][1], test_package)
-            self.assertEqual(mock_publish.call_args_list[0][0][1],
-                             os.path.join(fuchsia_out_dir, 'amber-files'))
-            self.assertEqual(mock_install.call_args_list[0][0][1],
-                             fuchsia_out_dir)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/build/fuchsia/test/ffx_integration.py b/build/fuchsia/test/ffx_integration.py
index 424873f..323f8d3 100644
--- a/build/fuchsia/test/ffx_integration.py
+++ b/build/fuchsia/test/ffx_integration.py
@@ -323,12 +323,7 @@
             sys.exit(1)
 
         # There should be precisely one suite for the test that ran.
-        suites_list = run_summary.get('data', {}).get('suites')
-        if not suites_list:
-            logging.error('Missing or empty list of suites in %s',
-                          run_summary_path)
-            return
-        suite_summary = suites_list[0]
+        suite_summary = run_summary.get('data', {}).get('suites', [{}])[0]
 
         # Get the top-level directory holding all artifacts for this suite.
         artifact_dir = suite_summary.get('artifact_dir')
diff --git a/build/fuchsia/test/run_test.py b/build/fuchsia/test/run_test.py
index 7979024..e5246ce 100755
--- a/build/fuchsia/test/run_test.py
+++ b/build/fuchsia/test/run_test.py
@@ -12,7 +12,7 @@
 from typing import List
 
 from common import register_common_args, register_device_args, \
-                   register_log_args, resolve_packages, \
+                   register_log_args, resolve_packages, resolve_v1_packages, \
                    set_ffx_isolate_dir
 from compatible_utils import running_unattended
 from ffx_integration import ScopedFfxConfig, test_connection
@@ -113,7 +113,11 @@
         if ermine.exists:
             ermine.take_to_shell()
 
-        resolve_packages(package_deps.keys(), runner_args.target_id)
+        if test_runner.is_cfv2():
+            resolve_packages(package_deps.keys(), runner_args.target_id)
+        else:
+            # TODO(crbug.com/1256503): Remove when all packages are CFv2.
+            resolve_v1_packages(package_deps.keys(), runner_args.target_id)
         return test_runner.run_test().returncode
 
 
diff --git a/build/util/LASTCHANGE b/build/util/LASTCHANGE
index b4fafb7..99c5b89 100644
--- a/build/util/LASTCHANGE
+++ b/build/util/LASTCHANGE
@@ -1,2 +1,2 @@
-LASTCHANGE=d286aa4250f1712ef8180d76226c6a83169be222-refs/heads/main@{#1079662}
+LASTCHANGE=d5942868d8db2c03a17b71f8670cf23807a47c15-refs/heads/main@{#1078771}
 LASTCHANGE_YEAR=2022
diff --git a/build/util/LASTCHANGE.committime b/build/util/LASTCHANGE.committime
index 22701fa..13be88b 100644
--- a/build/util/LASTCHANGE.committime
+++ b/build/util/LASTCHANGE.committime
@@ -1 +1 @@
-1670316727
\ No newline at end of file
+1670015561
\ No newline at end of file
diff --git "a/scripts/code_generation_hashes/GL_CTS_\050dEQP\051_build_files.json" "b/scripts/code_generation_hashes/GL_CTS_\050dEQP\051_build_files.json"
index 81e53aa..a7d55a7 100644
--- "a/scripts/code_generation_hashes/GL_CTS_\050dEQP\051_build_files.json"
+++ "b/scripts/code_generation_hashes/GL_CTS_\050dEQP\051_build_files.json"
@@ -110,7 +110,7 @@
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/renderpass/CMakeLists.txt":
     "ece653348fd035e6dc0f86b7b2e7ca63",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/robustness/CMakeLists.txt":
-    "6f7b2a6ea33eb881d18610df391fe39e",
+    "2271b2cd6b11abe1ce8bf6162dac201a",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/sc/CMakeLists.txt":
     "791931c4d4da197a5fa79b93d6124dc5",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/shaderexecutor/CMakeLists.txt":
@@ -176,7 +176,7 @@
   "third_party/VK-GL-CTS/src/framework/opengl/wrapper/CMakeLists.txt":
     "31a7adfb6e907b53ef24bb6ea044b838",
   "third_party/VK-GL-CTS/src/framework/platform/CMakeLists.txt":
-    "55962ac540f8d39eefc2e1585c564f05",
+    "47bfcb91684cc17981aeb13a183eb841",
   "third_party/VK-GL-CTS/src/framework/qphelper/CMakeLists.txt":
     "4118a22199375e743dee74afda146f55",
   "third_party/VK-GL-CTS/src/framework/randomshaders/CMakeLists.txt":
diff --git a/scripts/code_generation_hashes/Vulkan_mandatory_format_support_table.json b/scripts/code_generation_hashes/Vulkan_mandatory_format_support_table.json
index ab405d4..ed6ef6f 100644
--- a/scripts/code_generation_hashes/Vulkan_mandatory_format_support_table.json
+++ b/scripts/code_generation_hashes/Vulkan_mandatory_format_support_table.json
@@ -10,5 +10,5 @@
   "src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp":
     "a726ee791eb4964c406f3921d9b73346",
   "third_party/vulkan-deps/vulkan-headers/src/registry/vk.xml":
-    "d9b6c31c27aa4533d48f5c34a88e7d18"
+    "042160cf7ee7d5d2fc56a678ac2afdee"
 }
\ No newline at end of file
diff --git a/scripts/code_generation_hashes/overlay_fonts.json b/scripts/code_generation_hashes/overlay_fonts.json
index c6bf036..9c4aa53 100644
--- a/scripts/code_generation_hashes/overlay_fonts.json
+++ b/scripts/code_generation_hashes/overlay_fonts.json
@@ -1,8 +1,8 @@
 {
   "src/libANGLE/Overlay_font_autogen.cpp":
-    "b2568efb8872b16b09369cb53c730e6c",
+    "7d7d6fa95d2b3a0c7d4e9a118331a26d",
   "src/libANGLE/Overlay_font_autogen.h":
-    "ca2e38137ec27572e2ad695ff89f464d",
+    "ea11ceeb31a33a1230aad15e46411819",
   "src/libANGLE/gen_overlay_fonts.py":
-    "7ad77669b7b725460e184d23b97c377c"
+    "c8fc1c07dff51c29bc7d501e8a60edf4"
 }
\ No newline at end of file
diff --git a/src/libANGLE/Overlay_font_autogen.cpp b/src/libANGLE/Overlay_font_autogen.cpp
index 6700568..7df5893 100644
--- a/src/libANGLE/Overlay_font_autogen.cpp
+++ b/src/libANGLE/Overlay_font_autogen.cpp
@@ -1,24 +1,10 @@
 // GENERATED FILE - DO NOT EDIT.
-// Generated by gen_overlay_fonts.py using images from overlay/RobotoMono-Bold.ttf.
+// Generated by gen_overlay_fonts.py using images from overlay/DejaVuSansMono-Bold.ttf.
 //
 // Copyright 2022 The ANGLE Project Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Font copyright Google:
-//
-//     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.
-//
 // Overlay_font_autogen.cpp:
 //   Autogenerated overlay font data.
 
@@ -35,7 +21,7 @@
 #if ANGLE_ENABLE_OVERLAY
 namespace
 {
-constexpr uint8_t kFontData[77425] = {
+constexpr uint8_t kFontData[67830] = {
     // clang-format off
 // Large
 // ' '
@@ -73,11 +59,6 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
 // '!'
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   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,32 +66,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,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x28,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x28,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x28,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x28,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x28,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x28,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x28,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x28,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x28,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x1D,0xFF,0xFF,0xFF,0x95,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x05,0xFE,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0x64,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xD2,0xFF,0xFF,0x4C,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xB9,0xFF,0xFF,0x34,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x4E,0xFF,0xFF,0xFF,0xB4,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x49,0xFF,0xFF,0xFF,0xB0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x45,0xFF,0xFF,0xFF,0xAC,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x41,0xFF,0xFF,0xFF,0xA8,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x3D,0xFF,0xFF,0xFF,0xA4,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x39,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x35,0xFF,0xFF,0xFF,0x9C,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x31,0xFF,0xFF,0xFF,0x98,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x2D,0xFF,0xFF,0xFF,0x94,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x29,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x25,0xFF,0xFF,0xFF,0x8C,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x21,0xFF,0xFF,0xFF,0x88,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x1D,0xFF,0xFF,0xFF,0x84,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x13,0xC3,0xC3,0xC3,0x63,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x1D,0x5B,0x3C,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x2D,0xF4,0xFF,0xFF,0x82,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x88,0xFF,0xFF,0xFF,0xEB,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x72,0xFF,0xFF,0xFF,0xD5,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x0A,0xAC,0xF4,0xD5,0x39,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x28,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x28,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x28,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x28,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -125,19 +101,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,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x03,0xFF,0xFF,0xE3,   0,   0,0x2F,0xFF,0xFF,0xB7,   0,   0,   0,   0,
-   0,   0,   0,0x03,0xFF,0xFF,0xE2,   0,   0,0x2F,0xFF,0xFF,0xB6,   0,   0,   0,   0,
-   0,   0,   0,0x03,0xFF,0xFF,0xD3,   0,   0,0x2F,0xFF,0xFF,0xA7,   0,   0,   0,   0,
-   0,   0,   0,0x03,0xFF,0xFF,0xC2,   0,   0,0x2F,0xFF,0xFF,0x96,   0,   0,   0,   0,
-   0,   0,   0,0x03,0xFF,0xFF,0xB1,   0,   0,0x2F,0xFF,0xFF,0x85,   0,   0,   0,   0,
-   0,   0,   0,0x03,0xFF,0xFF,0xA0,   0,   0,0x2F,0xFF,0xFF,0x74,   0,   0,   0,   0,
-   0,   0,   0,0x03,0xFF,0xFF,0x8F,   0,   0,0x2F,0xFF,0xFF,0x63,   0,   0,   0,   0,
-   0,   0,   0,0x02,0xA7,0xA7,0x54,   0,   0,0x1F,0xA7,0xA7,0x38,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xBC,0xFF,0xFF,0xE4,   0,   0,   0,0x7C,0xFF,0xFF,0xFF,0x24,   0,   0,
+   0,   0,   0,0xBC,0xFF,0xFF,0xE4,   0,   0,   0,0x7C,0xFF,0xFF,0xFF,0x24,   0,   0,
+   0,   0,   0,0xBC,0xFF,0xFF,0xE4,   0,   0,   0,0x7C,0xFF,0xFF,0xFF,0x24,   0,   0,
+   0,   0,   0,0xBC,0xFF,0xFF,0xE4,   0,   0,   0,0x7C,0xFF,0xFF,0xFF,0x24,   0,   0,
+   0,   0,   0,0xBC,0xFF,0xFF,0xE4,   0,   0,   0,0x7C,0xFF,0xFF,0xFF,0x24,   0,   0,
+   0,   0,   0,0xBC,0xFF,0xFF,0xE4,   0,   0,   0,0x7C,0xFF,0xFF,0xFF,0x24,   0,   0,
+   0,   0,   0,0xBC,0xFF,0xFF,0xE4,   0,   0,   0,0x7C,0xFF,0xFF,0xFF,0x24,   0,   0,
+   0,   0,   0,0xBC,0xFF,0xFF,0xE4,   0,   0,   0,0x7C,0xFF,0xFF,0xFF,0x24,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -166,31 +137,26 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0xA3,0xFF,0xE4,   0,   0,0x42,0xFF,0xFF,0x48,   0,   0,
-   0,   0,   0,   0,   0,   0,0xD0,0xFF,0xB8,   0,   0,0x6F,0xFF,0xFF,0x1B,   0,   0,
-   0,   0,   0,   0,   0,0x04,0xF8,0xFF,0x8B,   0,   0,0x9C,0xFF,0xED,   0,   0,   0,
-   0,   0,   0,   0,   0,0x2B,0xFF,0xFF,0x5E,   0,   0,0xC8,0xFF,0xC0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x58,0xFF,0xFF,0x32,   0,0x01,0xF3,0xFF,0x93,   0,   0,   0,
-   0,   0,   0,   0,   0,0x85,0xFF,0xFD,0x09,   0,0x21,0xFF,0xFF,0x66,   0,   0,   0,
-   0,0x5B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x63,
-   0,0x5B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x63,
-   0,0x2C,0x7B,0x7B,0x86,0xFF,0xFF,0xB5,0x7B,0x7B,0xD8,0xFF,0xEB,0x7B,0x7B,0x7B,0x30,
-   0,   0,   0,   0,0x37,0xFF,0xFF,0x4D,   0,   0,0xD7,0xFF,0xB4,   0,   0,   0,   0,
-   0,   0,   0,   0,0x65,0xFF,0xFF,0x20,   0,0x08,0xFC,0xFF,0x85,   0,   0,   0,   0,
-   0,   0,   0,   0,0x93,0xFF,0xF2,0x01,   0,0x33,0xFF,0xFF,0x57,   0,   0,   0,   0,
-0x30,0x73,0x73,0x73,0xD8,0xFF,0xE5,0x73,0x73,0xA3,0xFF,0xFF,0x90,0x73,0x73,0x24,   0,
-0x6B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x4F,   0,
-0x6B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x4F,   0,
-   0,   0,   0,0x46,0xFF,0xFF,0x40,   0,   0,0xE6,0xFF,0xA0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x72,0xFF,0xFF,0x15,   0,0x12,0xFF,0xFF,0x74,   0,   0,   0,   0,   0,
-   0,   0,   0,0x9E,0xFF,0xE9,   0,   0,0x3E,0xFF,0xFF,0x48,   0,   0,   0,   0,   0,
-   0,   0,   0,0xCA,0xFF,0xBC,   0,   0,0x6A,0xFF,0xFF,0x1C,   0,   0,   0,   0,   0,
-   0,   0,0x01,0xF4,0xFF,0x90,   0,   0,0x96,0xFF,0xF0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x22,0xFF,0xFF,0x65,   0,   0,0xC2,0xFF,0xC5,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x43,0xFF,0xFF,0xE1,   0,   0,0x43,0xFF,0xFF,0xE7,   0,
+   0,   0,   0,   0,   0,   0,0x87,0xFF,0xFF,0x9C,   0,   0,0x87,0xFF,0xFF,0xA2,   0,
+   0,   0,   0,   0,   0,   0,0xCC,0xFF,0xFF,0x57,   0,   0,0xCB,0xFF,0xFF,0x5B,   0,
+   0,   0,   0,   0,   0,0x13,0xFD,0xFF,0xFE,0x14,   0,0x11,0xFD,0xFF,0xFE,0x16,   0,
+   0,   0,   0,   0,   0,0x56,0xFF,0xFF,0xCE,   0,   0,0x52,0xFF,0xFF,0xCF,   0,   0,
+   0,0x58,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+   0,0x58,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+   0,0x58,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+   0,   0,   0,   0,0x5F,0xFF,0xFF,0xC1,   0,   0,0x56,0xFF,0xFF,0xC9,   0,   0,   0,
+   0,   0,   0,   0,0xA3,0xFF,0xFF,0x7E,   0,   0,0x99,0xFF,0xFF,0x86,   0,   0,   0,
+   0,   0,   0,   0,0xE5,0xFF,0xFF,0x3B,   0,   0,0xDC,0xFF,0xFF,0x43,   0,   0,   0,
+   0,   0,   0,0x2A,0xFF,0xFF,0xF4,0x05,   0,0x1E,0xFF,0xFF,0xF8,0x08,   0,   0,   0,
+0xF8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC8,   0,
+0xF8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC8,   0,
+0xF8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC8,   0,
+   0,   0,0x2F,0xFF,0xFF,0xF1,0x04,   0,0x27,0xFF,0xFF,0xF6,0x07,   0,   0,   0,   0,
+   0,   0,0x73,0xFF,0xFF,0xB1,   0,   0,0x6B,0xFF,0xFF,0xB9,   0,   0,   0,   0,   0,
+   0,   0,0xB7,0xFF,0xFF,0x6D,   0,   0,0xAF,0xFF,0xFF,0x75,   0,   0,   0,   0,   0,
+   0,0x05,0xF4,0xFF,0xFF,0x29,   0,0x03,0xEF,0xFF,0xFF,0x31,   0,   0,   0,   0,   0,
+   0,0x3E,0xFF,0xFF,0xE5,   0,   0,0x36,0xFF,0xFF,0xEC,0x01,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -204,37 +170,32 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x39,0x57,0x35,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xA7,0xFF,0x9B,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xA7,0xFF,0x9B,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x13,0xB8,0xFF,0xAA,0x06,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x01,0x5F,0xCD,0xFF,0xFF,0xFF,0xFF,0xF7,0xA4,0x22,   0,   0,   0,
-   0,   0,   0,0x05,0xB0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF4,0x45,   0,   0,
-   0,   0,   0,0x8A,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEF,0x1A,   0,
-   0,   0,0x0F,0xF8,0xFF,0xFF,0xFF,0x8D,0x21,0x0D,0x4A,0xE1,0xFF,0xFF,0xFF,0x8D,   0,
-   0,   0,0x4C,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,0x47,0xFF,0xFF,0xFF,0xDE,   0,
-   0,   0,0x62,0xFF,0xFF,0xFF,0x8E,   0,   0,   0,   0,0x01,0xF5,0xFF,0xFF,0xFF,0x0C,
-   0,   0,0x52,0xFF,0xFF,0xFF,0xB3,   0,   0,   0,   0,   0,0x70,0x83,0x83,0x83,0x0D,
-   0,   0,0x1A,0xFE,0xFF,0xFF,0xFF,0x6E,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0xA5,0xFF,0xFF,0xFF,0xFF,0xC6,0x56,0x06,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x0F,0xCF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE9,0x83,0x14,   0,   0,   0,   0,
-   0,   0,   0,   0,0x0B,0x98,0xFD,0xFF,0xFF,0xFF,0xFF,0xFF,0xF1,0x6F,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x28,0x98,0xF2,0xFF,0xFF,0xFF,0xFF,0xFF,0x9F,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x0A,0x62,0xD7,0xFF,0xFF,0xFF,0xFF,0x61,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x06,0x9C,0xFF,0xFF,0xFF,0xD3,   0,
-   0,0x1B,0x97,0x97,0x97,0x75,   0,   0,   0,   0,   0,0x08,0xF1,0xFF,0xFF,0xFF,0x0E,
-   0,0x1D,0xFF,0xFF,0xFF,0xE0,   0,   0,   0,   0,   0,   0,0xD4,0xFF,0xFF,0xFF,0x1E,
-   0,0x02,0xED,0xFF,0xFF,0xFF,0x42,   0,   0,   0,   0,0x16,0xF8,0xFF,0xFF,0xFD,0x0B,
-   0,   0,0x99,0xFF,0xFF,0xFF,0xEC,0x65,0x16,0x0D,0x3D,0xC9,0xFF,0xFF,0xFF,0xC7,   0,
-   0,   0,0x1A,0xEB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x4A,   0,
-   0,   0,   0,0x37,0xE7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFD,0x73,   0,   0,
-   0,   0,   0,   0,0x13,0x86,0xDF,0xFF,0xFF,0xFF,0xFF,0xF4,0xAB,0x35,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x15,0xF2,0xFF,0x64,0x03,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEF,0xFF,0x4F,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEF,0xFF,0x4F,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x2C,0xFF,0xD4,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x2C,0xFF,0xD5,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x2C,0xFF,0xD7,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x0E,0x79,0xCA,0xF4,0xFF,0xFF,0xE6,0xBF,0x81,0x32,   0,   0,   0,
+   0,   0,   0,0x2A,0xE2,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x24,   0,   0,
+   0,   0,0x05,0xDB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x24,   0,   0,
+   0,   0,0x58,0xFF,0xFF,0xFF,0xB5,0x46,0xFF,0xD4,0x1F,0x63,0xD0,0xFF,0x24,   0,   0,
+   0,   0,0x94,0xFF,0xFF,0xFF,0x2A,0x2C,0xFF,0xD4,   0,   0,0x02,0x7A,0x21,   0,   0,
+   0,   0,0xA7,0xFF,0xFF,0xFF,0x1B,0x2C,0xFF,0xD4,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x96,0xFF,0xFF,0xFF,0x6B,0x2C,0xFF,0xD4,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x58,0xFF,0xFF,0xFF,0xFB,0xA8,0xFF,0xD5,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x05,0xD8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEA,0xA6,0x3F,   0,   0,   0,   0,
+   0,   0,   0,0x25,0xDB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA0,0x06,   0,   0,
+   0,   0,   0,   0,0x09,0x76,0xDA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x91,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x43,0xFF,0xEF,0xD6,0xFF,0xFF,0xFF,0xFB,0x1A,   0,
+   0,   0,   0,   0,   0,   0,   0,0x2C,0xFF,0xD4,0x04,0xB8,0xFF,0xFF,0xFF,0x5A,   0,
+   0,   0,   0,   0,   0,   0,   0,0x2C,0xFF,0xD4,   0,0x59,0xFF,0xFF,0xFF,0x72,   0,
+   0,   0,0x77,0x5F,0x02,   0,   0,0x2C,0xFF,0xD4,   0,0x6D,0xFF,0xFF,0xFF,0x62,   0,
+   0,   0,0x90,0xFF,0xDB,0x76,0x2D,0x35,0xFF,0xD5,0x3C,0xE5,0xFF,0xFF,0xFF,0x24,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA3,   0,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB9,0x0A,   0,   0,
+   0,   0,0x0A,0x46,0x88,0xBE,0xDC,0xF7,0xFF,0xFF,0xEC,0xB9,0x5A,0x02,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x30,0xFF,0xD6,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x2F,0xFF,0xD5,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x2E,0xFF,0xD4,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x2D,0xFF,0xD4,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -245,32 +206,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x0B,0x88,0xE3,0xFA,0xE5,0x97,0x14,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-0x04,0xCD,0xFF,0xFF,0xFF,0xFF,0xFF,0xD7,0x08,   0,   0,   0,   0,   0,   0,   0,   0,
-0x4B,0xFF,0xFF,0xC5,0x6B,0xBC,0xFF,0xFF,0x54,   0,   0,0x12,0x21,   0,   0,   0,   0,
-0x76,0xFF,0xFF,0x33,   0,0x25,0xFF,0xFF,0x81,   0,   0,0x97,0xFE,0x88,   0,   0,   0,
-0x7D,0xFF,0xFF,0x29,   0,0x1A,0xFF,0xFF,0x89,   0,0x29,0xFC,0xFF,0x37,   0,   0,   0,
-0x5B,0xFF,0xFF,0x7F,0x0A,0x70,0xFF,0xFF,0x66,   0,0xB4,0xFF,0xA9,   0,   0,   0,   0,
-0x15,0xF1,0xFF,0xFF,0xFF,0xFF,0xFF,0xF7,0x1E,0x43,0xFF,0xF9,0x22,   0,   0,   0,   0,
-   0,0x39,0xD9,0xFF,0xFF,0xFF,0xE1,0x44,0x02,0xCF,0xFF,0x8E,   0,   0,   0,   0,   0,
-   0,   0,0x05,0x38,0x4F,0x3C,0x07,   0,0x60,0xFF,0xEF,0x12,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x0A,0xE4,0xFF,0x73,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x7E,0xFF,0xDF,0x07,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x18,0xF3,0xFF,0x59,   0,0x26,0x53,0x4C,0x15,   0,   0,
-   0,   0,   0,   0,   0,   0,0x9B,0xFF,0xCA,0x0B,0x9C,0xFF,0xFF,0xFF,0xF9,0x7D,   0,
-   0,   0,   0,   0,   0,0x2D,0xFC,0xFF,0x3F,0x97,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x44,
-   0,   0,   0,   0,   0,0xB8,0xFF,0xB1,0x02,0xF5,0xFF,0xD4,0x18,0x3A,0xFB,0xFF,0xAF,
-   0,   0,   0,   0,0x48,0xFF,0xFB,0x28,0x20,0xFF,0xFF,0x83,   0,   0,0xCC,0xFF,0xD8,
-   0,   0,   0,   0,0xD0,0xFF,0x96,   0,0x2B,0xFF,0xFF,0x7C,   0,   0,0xC4,0xFF,0xE3,
-   0,   0,   0,   0,0x26,0x99,0x16,   0,0x14,0xFF,0xFF,0x95,   0,   0,0xD4,0xFF,0xCB,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0xE1,0xFF,0xF5,0x6D,0x7F,0xFF,0xFF,0x95,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x5C,0xFE,0xFF,0xFF,0xFF,0xFF,0xF3,0x1D,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x45,0xCC,0xF7,0xF2,0xB5,0x24,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x40,0xBD,0xF4,0xF2,0xB9,0x39,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x5E,0xFD,0xFF,0xFF,0xFF,0xFF,0xFB,0x53,   0,   0,   0,   0,   0,   0,   0,   0,
+0x18,0xF5,0xFF,0xCD,0x22,0x26,0xD4,0xFF,0xF2,0x14,   0,   0,   0,   0,   0,   0,   0,
+0x67,0xFF,0xFF,0x3E,   0,   0,0x47,0xFF,0xFF,0x61,   0,   0,   0,   0,   0,   0,   0,
+0x82,0xFF,0xFF,0x15,   0,   0,0x1D,0xFF,0xFF,0x7D,   0,   0,   0,   0,   0,   0,   0,
+0x68,0xFF,0xFF,0x3E,   0,   0,0x46,0xFF,0xFF,0x62,   0,   0,   0,   0,   0,   0,   0,
+0x19,0xF6,0xFF,0xCD,0x22,0x24,0xD2,0xFF,0xF2,0x14,   0,   0,   0,   0,   0,0x02,   0,
+   0,0x60,0xFD,0xFF,0xFF,0xFF,0xFF,0xFC,0x57,   0,   0,   0,   0,0x19,0x7C,0xE1,0x45,
+   0,   0,0x42,0xBE,0xF5,0xF3,0xBB,0x3C,   0,   0,0x01,0x47,0xAE,0xFB,0xD4,0x6F,0x11,
+   0,   0,   0,   0,   0,   0,   0,   0,0x17,0x78,0xDE,0xF5,0xA0,0x3A,   0,   0,   0,
+   0,   0,   0,   0,   0,0x01,0x43,0xAA,0xFA,0xD0,0x6B,0x0F,   0,   0,   0,   0,   0,
+   0,   0,   0,0x15,0x75,0xDB,0xF4,0x9C,0x37,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x3A,0xA7,0xF9,0xCD,0x68,0x0D,   0,   0,   0,0x67,0xD1,0xF8,0xE9,0x9F,0x1C,   0,
+   0,0x6F,0x99,0x32,   0,   0,   0,   0,   0,0x9A,0xFF,0xFF,0xFF,0xFF,0xFF,0xE9,0x25,
+   0,   0,   0,   0,   0,   0,   0,   0,0x4D,0xFF,0xFF,0xA0,0x12,0x49,0xF3,0xFF,0xC6,
+   0,   0,   0,   0,   0,   0,   0,   0,0xA7,0xFF,0xF3,0x0B,   0,   0,0x89,0xFF,0xFF,
+   0,   0,   0,   0,   0,   0,   0,   0,0xC2,0xFF,0xD5,   0,   0,   0,0x5D,0xFF,0xFF,
+   0,   0,   0,   0,   0,   0,   0,   0,0xA8,0xFF,0xF2,0x09,   0,   0,0x87,0xFF,0xFF,
+   0,   0,   0,   0,   0,   0,   0,   0,0x4F,0xFF,0xFF,0x9B,0x11,0x46,0xF2,0xFF,0xC7,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0x9E,0xFF,0xFF,0xFF,0xFF,0xFF,0xEB,0x27,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0x01,0x69,0xD2,0xF9,0xEA,0xA1,0x1E,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -285,32 +241,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x47,0xB1,0xE9,0xFA,0xE1,0x8F,0x13,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x8D,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xDF,0x18,   0,   0,   0,   0,   0,
-   0,   0,0x53,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA8,   0,   0,   0,   0,   0,
-   0,   0,0xC1,0xFF,0xFF,0xFF,0x92,0x53,0xC5,0xFF,0xFF,0xFB,0x0F,   0,   0,   0,   0,
-   0,   0,0xF6,0xFF,0xFF,0xBA,   0,   0,0x32,0xFF,0xFF,0xFF,0x2F,   0,   0,   0,   0,
-   0,0x02,0xFC,0xFF,0xFF,0x93,   0,   0,0x21,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,
-   0,   0,0xDF,0xFF,0xFF,0xC7,   0,0x02,0xA0,0xFF,0xFF,0xBF,   0,   0,   0,   0,   0,
-   0,   0,0x8F,0xFF,0xFF,0xFF,0x5B,0xBE,0xFF,0xFF,0xF1,0x2C,   0,   0,   0,   0,   0,
-   0,   0,0x24,0xFB,0xFF,0xFF,0xFF,0xFF,0xFF,0xEA,0x3C,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x8A,0xFF,0xFF,0xFF,0xFF,0xCD,0x1E,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x2B,0xDA,0xFF,0xFF,0xFF,0xFF,0x79,   0,   0,   0,0x1D,0x47,0x47,0x46,   0,
-   0,0x37,0xF3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFC,0x43,   0,   0,0x7C,0xFF,0xFF,0xEC,   0,
-0x12,0xEB,0xFF,0xFF,0xFC,0x9B,0xFF,0xFF,0xFF,0xEB,0x1E,   0,0x9D,0xFF,0xFF,0xD7,   0,
-0x84,0xFF,0xFF,0xFF,0x82,   0,0x95,0xFF,0xFF,0xFF,0xCB,0x0D,0xE8,0xFF,0xFF,0xA2,   0,
-0xD5,0xFF,0xFF,0xFF,0x1D,   0,0x05,0xC6,0xFF,0xFF,0xFF,0xD2,0xFF,0xFF,0xFF,0x5B,   0,
-0xEA,0xFF,0xFF,0xFF,0x10,   0,   0,0x1A,0xE8,0xFF,0xFF,0xFF,0xFF,0xFF,0xEA,0x07,   0,
-0xD5,0xFF,0xFF,0xFF,0x58,   0,   0,   0,0x3E,0xFB,0xFF,0xFF,0xFF,0xFF,0x5C,   0,   0,
-0x92,0xFF,0xFF,0xFF,0xF0,0x6C,0x3B,0x53,0x9F,0xFB,0xFF,0xFF,0xFF,0xF7,0x17,   0,   0,
-0x1D,0xF1,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB7,0x01,   0,
-   0,0x3F,0xEC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,0xF2,0xFF,0xFF,0xFF,0x6D,   0,
-   0,   0,0x16,0x82,0xCD,0xF2,0xFA,0xE7,0xB9,0x71,0x11,0x5A,0xFF,0xFF,0xFF,0xF7,0x2C,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x01,0x56,0xB0,0xE2,0xF7,0xF8,0xDA,0x95,0x36,   0,   0,   0,   0,
+   0,   0,   0,0x07,0xB7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,
+   0,   0,   0,0x7B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,
+   0,   0,   0,0xCF,0xFF,0xFF,0xFF,0x98,0x1B,0x08,0x26,0x5D,0xC4,0x13,   0,   0,   0,
+   0,   0,   0,0xE1,0xFF,0xFF,0xFF,0x29,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xB6,0xFF,0xFF,0xFF,0x75,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x52,0xFF,0xFF,0xFF,0xF0,0x19,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0xC3,0xFF,0xFF,0xFF,0xB8,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x5D,0xF5,0xFF,0xFF,0xFF,0xFF,0x66,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x77,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF1,0x1D,   0,   0,   0,   0,   0,   0,
+   0,0x45,0xFD,0xFF,0xFF,0xCB,0xA3,0xFF,0xFF,0xFF,0xB7,   0,   0,0x18,0xFF,0xFF,0xFF,
+   0,0xCB,0xFF,0xFF,0xE9,0x14,0x0E,0xE6,0xFF,0xFF,0xFF,0x60,   0,0x0B,0xFF,0xFF,0xFF,
+0x2E,0xFF,0xFF,0xFF,0x89,   0,   0,0x55,0xFF,0xFF,0xFF,0xEF,0x19,0x1D,0xFF,0xFF,0xFF,
+0x59,0xFF,0xFF,0xFF,0x5F,   0,   0,   0,0xB5,0xFF,0xFF,0xFF,0xB1,0x48,0xFF,0xFF,0xEA,
+0x71,0xFF,0xFF,0xFF,0x6B,   0,   0,   0,0x20,0xF5,0xFF,0xFF,0xFF,0xDB,0xFF,0xFF,0xAF,
+0x5F,0xFF,0xFF,0xFF,0xB1,   0,   0,   0,   0,0x76,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x4F,
+0x25,0xFF,0xFF,0xFF,0xFE,0x46,   0,   0,   0,0x04,0xD1,0xFF,0xFF,0xFF,0xFF,0xC7,0x02,
+   0,0xBE,0xFF,0xFF,0xFF,0xF5,0x6E,0x15,0x09,0x44,0xCB,0xFF,0xFF,0xFF,0xFF,0x5A,   0,
+   0,0x27,0xEE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD8,0x07,
+   0,   0,0x31,0xDD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x85,
+   0,   0,   0,0x09,0x69,0xBB,0xEA,0xFB,0xF3,0xD3,0x94,0x3C,0x55,0xFF,0xFF,0xFF,0xFA,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -325,19 +276,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,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x87,0xFF,0xFF,0x7F,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x87,0xFF,0xFF,0x7F,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x87,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x87,0xFF,0xFF,0x66,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x87,0xFF,0xFF,0x55,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x87,0xFF,0xFF,0x44,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x87,0xFF,0xFF,0x33,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x76,0xDF,0xDF,0x1F,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0x84,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0x84,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0x84,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0x84,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0x84,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0x84,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0x84,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0x84,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -364,80 +310,70 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0x77,0xFF,0xFF,0xD4,0x01,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0x23,0xF6,0xFF,0xFF,0x5A,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0xAE,0xFF,0xFF,0xDB,0x03,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x37,0xFF,0xFF,0xFF,0x69,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xB0,0xFF,0xFF,0xFA,0x13,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x1E,0xFD,0xFF,0xFF,0xB3,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x7C,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xCB,0xFF,0xFF,0xFF,0x1F,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x0F,0xFE,0xFF,0xFF,0xE8,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x42,0xFF,0xFF,0xFF,0xB2,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x68,0xFF,0xFF,0xFF,0x95,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x83,0xFF,0xFF,0xFF,0x82,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x8F,0xFF,0xFF,0xFF,0x70,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x8F,0xFF,0xFF,0xFF,0x71,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x83,0xFF,0xFF,0xFF,0x83,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x68,0xFF,0xFF,0xFF,0x95,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x41,0xFF,0xFF,0xFF,0xB4,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x0E,0xFE,0xFF,0xFF,0xE9,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xCA,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x7A,0xFF,0xFF,0xFF,0x5D,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x1D,0xFD,0xFF,0xFF,0xB5,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xAF,0xFF,0xFF,0xFB,0x14,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x35,0xFF,0xFF,0xFF,0x6B,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0xAD,0xFF,0xFF,0xDC,0x03,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0x22,0xF6,0xFF,0xFF,0x5A,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0x76,0xFF,0xFF,0xD4,0x01,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x1B,0xAD,0x18,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x35,0xEA,0xFF,0x70,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x2A,0xEF,0xFF,0xFD,0x60,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x0A,0xD7,0xFF,0xFF,0x6E,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x88,0xFF,0xFF,0xB1,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x15,0xF7,0xFF,0xFB,0x24,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x7E,0xFF,0xFF,0xAF,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x04,0xE9,0xFF,0xFF,0x53,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x40,0xFF,0xFF,0xF5,0x08,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x85,0xFF,0xFF,0xC3,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xBC,0xFF,0xFF,0x95,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x72,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x04,0xFD,0xFF,0xFF,0x59,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x11,0xFF,0xFF,0xFF,0x4B,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x1A,0xFF,0xFF,0xFF,0x45,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x16,0xFF,0xFF,0xFF,0x47,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x0C,0xFF,0xFF,0xFF,0x4F,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xF5,0xFF,0xFF,0x62,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xD5,0xFF,0xFF,0x7E,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xA6,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x68,0xFF,0xFF,0xDB,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x1E,0xFF,0xFF,0xFF,0x27,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0xC2,0xFF,0xFF,0x79,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xDA,0x01,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x02,0xD5,0xFF,0xFF,0x5A,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x40,0xFE,0xFF,0xEA,0x18,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x89,0xFF,0xFF,0xC4,0x0D,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x02,0xAA,0xFF,0xFF,0x8F,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x03,0x91,0xFF,0x48,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x3A,0x04,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
 // ')'
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x62,0xFF,0xFF,0xE1,0x0C,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x05,0xE0,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x69,0xFF,0xFF,0xFB,0x28,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x07,0xEC,0xFF,0xFF,0xAC,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFD,0x27,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x3D,0xFF,0xFF,0xFF,0x8F,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x01,0xE3,0xFF,0xFF,0xEB,0x03,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,0x3E,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x71,0xFF,0xFF,0xFF,0x80,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x3B,0xFF,0xFF,0xFF,0xB6,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x1E,0xFF,0xFF,0xFF,0xDB,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x0B,0xFF,0xFF,0xFF,0xF6,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0xF8,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0xF9,0xFF,0xFF,0xFF,0x02,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x0C,0xFF,0xFF,0xFF,0xF5,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x1E,0xFF,0xFF,0xFF,0xDA,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x3C,0xFF,0xFF,0xFF,0xB5,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xA9,0xFF,0xFF,0xFF,0x3C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x01,0xE4,0xFF,0xFF,0xEA,0x03,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x3E,0xFF,0xFF,0xFF,0x8F,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x98,0xFF,0xFF,0xFD,0x27,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x07,0xEC,0xFF,0xFF,0xAB,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x6A,0xFF,0xFF,0xFB,0x27,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x05,0xE0,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x62,0xFF,0xFF,0xE1,0x0C,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x04,0xB1,0x30,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x49,0xFF,0xF8,0x57,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x39,0xF2,0xFF,0xFC,0x4F,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x44,0xFC,0xFF,0xEF,0x1C,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x87,0xFF,0xFF,0xBB,0x01,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x0C,0xEC,0xFF,0xFF,0x55,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x83,0xFF,0xFF,0xD2,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x23,0xFF,0xFF,0xFF,0x39,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xD8,0xFF,0xFF,0x84,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xA1,0xFF,0xFF,0xC7,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x74,0xFF,0xFF,0xFC,0x0E,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x4B,0xFF,0xFF,0xFF,0x3A,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x38,0xFF,0xFF,0xFF,0x5B,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x29,0xFF,0xFF,0xFF,0x6B,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x1A,0xFF,0xFF,0xFF,0x75,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x20,0xFF,0xFF,0xFF,0x71,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x2F,0xFF,0xFF,0xFF,0x66,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x3E,0xFF,0xFF,0xFF,0x4C,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x58,0xFF,0xFF,0xFF,0x28,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x85,0xFF,0xFF,0xEB,0x01,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xB2,0xFF,0xFF,0xA9,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x03,0xEE,0xFF,0xFF,0x66,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x46,0xFF,0xFF,0xF8,0x13,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0xB3,0xFF,0xFF,0x9D,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x39,0xFF,0xFF,0xF7,0x20,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x06,0xCD,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x02,0x9F,0xFF,0xFF,0xBB,0x02,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x63,0xFF,0xFF,0xD0,0x10,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x20,0xFF,0xB6,0x10,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x3F,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
 // '*'
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   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,25 +381,20 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x0A,0xFF,0xFF,0xF8,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xF5,0xFF,0xE1,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xE1,0xFF,0xCB,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x06,   0,   0,   0,   0,0xCC,0xFF,0xB5,   0,   0,   0,   0,   0,   0,
-   0,   0,0x18,0xEA,0x81,0x16,   0,   0,0xB8,0xFF,0x9F,   0,   0,0x0C,0x6E,0xC0,   0,
-   0,   0,0x66,0xFF,0xFF,0xF7,0x99,0x27,0xA3,0xFF,0x89,0x1D,0x8A,0xF0,0xFF,0xFF,0x31,
-   0,   0,0xA6,0xFF,0xFF,0xFF,0xFF,0xFE,0xEE,0xFF,0xE0,0xFB,0xFF,0xFF,0xFF,0xFF,0x80,
-   0,   0,   0,0x28,0x68,0xA8,0xE8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFB,0xC9,0x8C,0x4F,0x13,
-   0,   0,   0,   0,   0,   0,   0,0x9C,0xFF,0xFF,0xFF,0x71,0x0B,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x54,0xFE,0xFF,0xDE,0xFF,0xDE,0x13,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x31,0xF5,0xFF,0xC0,0x29,0xFB,0xFF,0xBD,0x04,   0,   0,   0,
-   0,   0,   0,   0,0x17,0xE2,0xFF,0xFD,0x31,   0,0x96,0xFF,0xFF,0x91,   0,   0,   0,
-   0,   0,   0,0x07,0xC6,0xFF,0xFF,0x9C,   0,   0,0x16,0xF2,0xFF,0xFF,0x61,   0,   0,
-   0,   0,   0,0x03,0x7A,0xFA,0xF3,0x18,   0,   0,   0,0x7A,0xFF,0xEC,0x4B,   0,   0,
-   0,   0,   0,   0,   0,0x34,0x61,   0,   0,   0,   0,0x09,0xA8,0x1C,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x84,0xFF,0xE8,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x84,0xFF,0xE8,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x84,0xFF,0xE8,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x7E,0xA7,0x2A,   0,   0,0x84,0xFF,0xE8,   0,   0,0x0B,0x74,0xC7,0x09,   0,
+   0,0x15,0xF6,0xFF,0xFD,0xAA,0x2D,0x84,0xFF,0xE8,0x0D,0x78,0xEB,0xFF,0xFF,0x73,   0,
+   0,   0,0x2B,0xA2,0xFB,0xFF,0xFE,0xE8,0xFF,0xF9,0xED,0xFF,0xFF,0xD2,0x5B,0x03,   0,
+   0,   0,   0,   0,0x1E,0x92,0xF5,0xFF,0xFF,0xFF,0xFF,0xC5,0x4D,0x01,   0,   0,   0,
+   0,   0,   0,   0,0x1E,0x91,0xF5,0xFF,0xFF,0xFF,0xFF,0xC5,0x4C,0x01,   0,   0,   0,
+   0,   0,0x2A,0xA1,0xFB,0xFF,0xFD,0xE4,0xFF,0xF8,0xE9,0xFF,0xFF,0xD2,0x5A,0x03,   0,
+   0,0x15,0xF6,0xFF,0xFD,0xA7,0x28,0x84,0xFF,0xE8,0x0A,0x74,0xE9,0xFF,0xFF,0x73,   0,
+   0,   0,0x7E,0xA7,0x28,   0,   0,0x84,0xFF,0xE8,   0,   0,0x0A,0x73,0xC8,0x09,   0,
+   0,   0,   0,   0,   0,   0,   0,0x84,0xFF,0xE8,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x84,0xFF,0xE8,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x84,0xFF,0xE8,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -490,26 +421,21 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x28,0x63,0x63,0x63,0x22,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x67,0xFF,0xFF,0xFF,0x57,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x67,0xFF,0xFF,0xFF,0x57,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x67,0xFF,0xFF,0xFF,0x57,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x67,0xFF,0xFF,0xFF,0x57,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x67,0xFF,0xFF,0xFF,0x57,   0,   0,   0,   0,   0,   0,
-   0,0x68,0xAF,0xAF,0xAF,0xAF,0xD0,0xFF,0xFF,0xFF,0xCB,0xAF,0xAF,0xAF,0xAF,0x5D,   0,
-   0,0x97,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x87,   0,
-   0,0x97,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x87,   0,
-   0,0x97,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x87,   0,
-   0,   0,   0,   0,   0,   0,0x67,0xFF,0xFF,0xFF,0x57,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x67,0xFF,0xFF,0xFF,0x57,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x67,0xFF,0xFF,0xFF,0x57,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x67,0xFF,0xFF,0xFF,0x57,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x67,0xFF,0xFF,0xFF,0x57,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x67,0xFF,0xFF,0xFF,0x57,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xF4,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xF4,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xF4,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xF4,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xF4,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xF4,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,   0,
+0x10,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x80,
+0x10,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x80,
+0x10,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x80,
+   0,   0,   0,   0,   0,   0,   0,0xF4,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xF4,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xF4,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xF4,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xF4,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xF4,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -541,23 +467,18 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x78,0xFF,0xFF,0xFF,0xF4,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x78,0xFF,0xFF,0xFF,0xF4,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x78,0xFF,0xFF,0xFF,0xF4,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x7A,0xFF,0xFF,0xFF,0xEF,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xAD,0xFF,0xFF,0xFF,0x8C,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x02,0xEE,0xFF,0xFF,0xF2,0x14,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x35,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x7A,0xFF,0xFF,0xEB,0x0D,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0xBE,0xFF,0xFF,0x73,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x9F,0xFF,0xFF,0xFF,0x0E,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x9F,0xFF,0xFF,0xFF,0x0D,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x9F,0xFF,0xFF,0xFF,0x0C,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0xA3,0xFF,0xFF,0xFD,0x04,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0xB2,0xFF,0xFF,0xE3,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0xDC,0xFF,0xFF,0x9F,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x28,0xFF,0xFF,0xFF,0x3F,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x93,0xFF,0xFF,0xB1,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x78,0xF4,0xE1,0x1A,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x17,0x22,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
 // '-'
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -576,15 +497,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,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x43,0x43,0x43,0x43,0x43,0x43,0x43,0x43,0x43,0x43,0x43,0x35,   0,
-   0,   0,   0,   0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC7,   0,
-   0,   0,   0,   0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC7,   0,
-   0,   0,   0,   0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC7,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0xBC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x34,   0,   0,   0,
+   0,   0,   0,   0,0xBC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x34,   0,   0,   0,
+   0,   0,   0,   0,0xBC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x34,   0,   0,   0,
+   0,   0,   0,   0,0xBC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x34,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -621,16 +537,11 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x0D,0x37,0x20,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x42,0xEE,0xFF,0xFF,0x98,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0xD8,0xFF,0xFF,0xFF,0xFF,0x3F,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x01,0xFA,0xFF,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0xBF,0xFF,0xFF,0xFF,0xFC,0x2B,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x1F,0xB8,0xF4,0xDC,0x5B,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -645,35 +556,30 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0x54,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xAC,0xFF,0xFF,0xF4,0x0A,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x0C,0xF6,0xFF,0xFF,0xA8,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x58,0xFF,0xFF,0xFF,0x52,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0xAE,0xFF,0xFF,0xF3,0x09,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x0D,0xF7,0xFF,0xFF,0xA6,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x5A,0xFF,0xFF,0xFF,0x50,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xB0,0xFF,0xFF,0xF2,0x08,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x0E,0xF8,0xFF,0xFF,0xA4,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0x4E,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0xB2,0xFF,0xFF,0xF1,0x07,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x0F,0xF9,0xFF,0xFF,0xA2,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x5E,0xFF,0xFF,0xFF,0x4C,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0xB4,0xFF,0xFF,0xF0,0x06,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x10,0xF9,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x60,0xFF,0xFF,0xFF,0x4A,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xB6,0xFF,0xFF,0xEF,0x06,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x12,0xFA,0xFF,0xFF,0x9E,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x62,0xFF,0xFF,0xFF,0x48,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0xB8,0xFF,0xFF,0xED,0x05,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x13,0xFB,0xFF,0xFF,0x9C,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x64,0xFF,0xFF,0xFF,0x46,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0xB7,0xFB,0xFB,0xE9,0x04,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x80,0xFF,0xFF,0xA0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x0A,0xEB,0xFF,0xFE,0x2B,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x6D,0xFF,0xFF,0xB2,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x04,0xDF,0xFF,0xFF,0x3C,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x5B,0xFF,0xFF,0xC5,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xD1,0xFF,0xFF,0x4E,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0x49,0xFF,0xFF,0xD7,0x01,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0xBF,0xFF,0xFF,0x61,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0x36,0xFF,0xFF,0xE4,0x06,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0xAD,0xFF,0xFF,0x74,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x26,0xFD,0xFF,0xF0,0x0D,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x9B,0xFF,0xFF,0x86,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x18,0xF8,0xFF,0xF8,0x18,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x88,0xFF,0xFF,0x99,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x0E,0xF0,0xFF,0xFD,0x25,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x76,0xFF,0xFF,0xAC,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x06,0xE6,0xFF,0xFF,0x36,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x64,0xFF,0xFF,0xBE,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x02,0xD8,0xFF,0xFF,0x48,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x51,0xFF,0xFF,0xD1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xC8,0xFF,0xFF,0x5A,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x3F,0xFF,0xFF,0xE0,0x04,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xB6,0xFF,0xFF,0x6D,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x2D,0xFF,0xFF,0xEC,0x0A,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -685,32 +591,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x41,0xA8,0xE3,0xF9,0xED,0xC5,0x73,0x09,   0,   0,   0,   0,
-   0,   0,   0,0x02,0x95,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xDE,0x26,   0,   0,   0,
-   0,   0,   0,0x7E,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE0,0x0C,   0,   0,
-   0,   0,0x1B,0xFA,0xFF,0xFF,0xFE,0x96,0x53,0x6F,0xEA,0xFF,0xFF,0xFF,0x82,   0,   0,
-   0,   0,0x7B,0xFF,0xFF,0xFF,0x90,   0,   0,   0,0x2F,0xFE,0xFF,0xFF,0xE6,0x01,   0,
-   0,   0,0xBB,0xFF,0xFF,0xFF,0x2E,   0,   0,   0,   0,0xCB,0xFF,0xFF,0xFF,0x26,   0,
-   0,   0,0xE6,0xFF,0xFF,0xFF,0x06,   0,   0,   0,   0,0x9E,0xFF,0xFF,0xFF,0x51,   0,
-   0,   0,0xF6,0xFF,0xFF,0xF9,   0,   0,   0,   0,0x0A,0xBC,0xFF,0xFF,0xFF,0x61,   0,
-   0,   0,0xFF,0xFF,0xFF,0xF7,   0,   0,   0,0x30,0xD7,0xFF,0xFF,0xFF,0xFF,0x6B,   0,
-   0,   0,0xFF,0xFF,0xFF,0xF7,   0,0x01,0x72,0xF9,0xFF,0xFF,0xFF,0xFF,0xFF,0x6B,   0,
-   0,   0,0xFF,0xFF,0xFF,0xF7,0x19,0xBA,0xFF,0xFF,0xB1,0xA0,0xFF,0xFF,0xFF,0x6B,   0,
-   0,   0,0xFF,0xFF,0xFF,0xFD,0xEB,0xFF,0xF5,0x68,   0,0x8B,0xFF,0xFF,0xFF,0x6B,   0,
-   0,   0,0xFF,0xFF,0xFF,0xFF,0xFF,0xCE,0x28,   0,   0,0x8B,0xFF,0xFF,0xFF,0x6B,   0,
-   0,   0,0xF6,0xFF,0xFF,0xFF,0x8B,0x06,   0,   0,   0,0x8D,0xFF,0xFF,0xFF,0x61,   0,
-   0,   0,0xE6,0xFF,0xFF,0xFF,0x08,   0,   0,   0,   0,0x98,0xFF,0xFF,0xFF,0x51,   0,
-   0,   0,0xBC,0xFF,0xFF,0xFF,0x2B,   0,   0,   0,   0,0xBD,0xFF,0xFF,0xFF,0x27,   0,
-   0,   0,0x7C,0xFF,0xFF,0xFF,0x8E,   0,   0,   0,0x1E,0xF9,0xFF,0xFF,0xE7,0x01,   0,
-   0,   0,0x1A,0xF9,0xFF,0xFF,0xFD,0x84,0x40,0x60,0xD7,0xFF,0xFF,0xFF,0x84,   0,   0,
-   0,   0,   0,0x79,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE1,0x0E,   0,   0,
-   0,   0,   0,0x01,0x90,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xDF,0x27,   0,   0,   0,
-   0,   0,   0,   0,   0,0x3F,0xA7,0xE3,0xF9,0xEE,0xC7,0x75,0x0A,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x39,0xA2,0xE0,0xF8,0xEB,0xC5,0x6F,0x07,   0,   0,   0,   0,
+   0,   0,   0,   0,0x81,0xFD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD3,0x1C,   0,   0,   0,
+   0,   0,   0,0x66,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xCF,0x06,   0,   0,
+   0,   0,0x0E,0xED,0xFF,0xFF,0xFF,0x80,0x0D,0x33,0xE0,0xFF,0xFF,0xFF,0x6C,   0,   0,
+   0,   0,0x69,0xFF,0xFF,0xFF,0xC2,   0,   0,   0,0x4D,0xFF,0xFF,0xFF,0xDA,   0,   0,
+   0,   0,0xB5,0xFF,0xFF,0xFF,0x69,   0,   0,   0,0x04,0xF0,0xFF,0xFF,0xFF,0x28,   0,
+   0,   0,0xEC,0xFF,0xFF,0xFF,0x36,   0,   0,   0,   0,0xC1,0xFF,0xFF,0xFF,0x5F,   0,
+   0,0x14,0xFF,0xFF,0xFF,0xFF,0x15,   0,   0,   0,   0,0x9F,0xFF,0xFF,0xFF,0x86,   0,
+   0,0x2E,0xFF,0xFF,0xFF,0xFE,0x03,0x61,0xEF,0xBE,0x0B,0x8B,0xFF,0xFF,0xFF,0xA0,   0,
+   0,0x39,0xFF,0xFF,0xFF,0xF9,   0,0xEF,0xFF,0xFF,0x67,0x83,0xFF,0xFF,0xFF,0xAC,   0,
+   0,0x41,0xFF,0xFF,0xFF,0xF5,   0,0xF0,0xFF,0xFF,0x68,0x7E,0xFF,0xFF,0xFF,0xB5,   0,
+   0,0x39,0xFF,0xFF,0xFF,0xF9,   0,0x64,0xEF,0xBE,0x0C,0x83,0xFF,0xFF,0xFF,0xAC,   0,
+   0,0x2E,0xFF,0xFF,0xFF,0xFE,0x03,   0,   0,   0,   0,0x8B,0xFF,0xFF,0xFF,0xA0,   0,
+   0,0x14,0xFF,0xFF,0xFF,0xFF,0x15,   0,   0,   0,   0,0x9F,0xFF,0xFF,0xFF,0x86,   0,
+   0,   0,0xEC,0xFF,0xFF,0xFF,0x36,   0,   0,   0,   0,0xC1,0xFF,0xFF,0xFF,0x5F,   0,
+   0,   0,0xB5,0xFF,0xFF,0xFF,0x68,   0,   0,   0,0x04,0xF0,0xFF,0xFF,0xFF,0x28,   0,
+   0,   0,0x69,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,0x4C,0xFF,0xFF,0xFF,0xDB,   0,   0,
+   0,   0,0x0E,0xED,0xFF,0xFF,0xFF,0x7E,0x0C,0x32,0xDF,0xFF,0xFF,0xFF,0x6D,   0,   0,
+   0,   0,   0,0x66,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD2,0x07,   0,   0,
+   0,   0,   0,   0,0x81,0xFE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD5,0x1D,   0,   0,   0,
+   0,   0,   0,   0,   0,0x39,0xA3,0xE0,0xF8,0xED,0xC6,0x70,0x07,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -725,32 +626,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x0E,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x13,0x6B,0xCB,0xA3,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x04,0x4D,0xAC,0xF9,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,
-   0,   0,   0,0x2F,0x8E,0xE9,0xFF,0xFF,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,
-   0,   0,0x7D,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,
-   0,   0,0x8B,0xFF,0xFF,0xFF,0xFF,0xF1,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,
-   0,   0,0x8B,0xFF,0xED,0x96,0x38,0x58,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,
-   0,   0,0x54,0x51,0x06,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x1D,0x58,0x92,0xCD,0xFC,0xFF,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,
+   0,   0,0x04,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,
+   0,   0,0x04,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,
+   0,   0,0x04,0xE2,0xA7,0x6C,0x31,0xAF,0xFF,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xAC,0xFF,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xAC,0xFF,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xAC,0xFF,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xAC,0xFF,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xAC,0xFF,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xAC,0xFF,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xAC,0xFF,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xAC,0xFF,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xAC,0xFF,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xAC,0xFF,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xAC,0xFF,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xAC,0xFF,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xAC,0xFF,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xAC,0xFF,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,
+   0,   0,0x58,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x14,
+   0,   0,0x58,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x14,
+   0,   0,0x58,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x14,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -765,32 +661,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x17,0x80,0xCA,0xED,0xFA,0xE7,0xB4,0x5C,0x04,   0,   0,   0,   0,
-   0,   0,   0,0x63,0xF5,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC6,0x15,   0,   0,   0,
-   0,   0,0x6B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,
-   0,0x23,0xFA,0xFF,0xFF,0xFF,0xC6,0x7A,0x70,0xBC,0xFF,0xFF,0xFF,0xFF,0x48,   0,   0,
-   0,0x95,0xFF,0xFF,0xFF,0xA5,0x01,   0,   0,   0,0xA3,0xFF,0xFF,0xFF,0x96,   0,   0,
-   0,0xDE,0xFF,0xFF,0xFF,0x23,   0,   0,   0,   0,0x3A,0xFF,0xFF,0xFF,0xB8,   0,   0,
-   0,0xC6,0xCB,0xCB,0xC8,0x02,   0,   0,   0,   0,0x24,0xFF,0xFF,0xFF,0xB9,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x5E,0xFF,0xFF,0xFF,0x90,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x08,0xD6,0xFF,0xFF,0xFF,0x3A,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x92,0xFF,0xFF,0xFF,0xBA,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x66,0xFF,0xFF,0xFF,0xEB,0x1C,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x4D,0xFB,0xFF,0xFF,0xFC,0x46,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x40,0xF7,0xFF,0xFF,0xFF,0x61,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x34,0xF2,0xFF,0xFF,0xFF,0x74,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x29,0xEB,0xFF,0xFF,0xFF,0x82,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x1F,0xE4,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x17,0xDB,0xFF,0xFF,0xFF,0x9D,0x01,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x10,0xD0,0xFF,0xFF,0xFF,0xD2,0x3E,0x3B,0x3B,0x3B,0x3B,0x3B,0x3B,0x3B,0x1D,   0,
-   0,0x8C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7B,   0,
-   0,0x93,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7B,   0,
-   0,0x93,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7B,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x1A,0x59,0x99,0xCC,0xEC,0xFB,0xF4,0xDE,0xAB,0x55,0x04,   0,   0,   0,   0,
+   0,   0,0xEC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xCD,0x22,   0,   0,   0,
+   0,   0,0xEC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE1,0x11,   0,   0,
+   0,   0,0xEC,0xFF,0xBB,0x5E,0x1E,0x08,0x24,0x8C,0xFF,0xFF,0xFF,0xFF,0x89,   0,   0,
+   0,   0,0xAD,0x32,   0,   0,   0,   0,   0,   0,0x9B,0xFF,0xFF,0xFF,0xDC,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x4C,0xFF,0xFF,0xFF,0xFC,0x02,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x42,0xFF,0xFF,0xFF,0xF9,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x81,0xFF,0xFF,0xFF,0xD0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0x12,0xEC,0xFF,0xFF,0xFF,0x7A,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0xAE,0xFF,0xFF,0xFF,0xE7,0x0E,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0x7D,0xFF,0xFF,0xFF,0xFE,0x4B,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x5F,0xFF,0xFF,0xFF,0xFF,0x77,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x4A,0xFB,0xFF,0xFF,0xFF,0x89,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x38,0xF5,0xFF,0xFF,0xFF,0x93,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x2A,0xED,0xFF,0xFF,0xFF,0x98,0x01,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x1E,0xE3,0xFF,0xFF,0xFF,0x9B,0x01,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x13,0xD7,0xFF,0xFF,0xFF,0x9D,0x01,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x0B,0xC9,0xFF,0xFF,0xFF,0xA0,0x02,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x5F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x0C,   0,
+   0,0x60,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x0C,   0,
+   0,0x60,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x0C,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -805,32 +696,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x22,0x87,0xCC,0xF0,0xFB,0xEC,0xC5,0x83,0x20,   0,   0,   0,   0,
-   0,   0,   0,0x74,0xF9,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF7,0x6A,   0,   0,   0,
-   0,   0,0x70,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x53,   0,   0,
-   0,0x0F,0xF6,0xFF,0xFF,0xFF,0xC8,0x64,0x4D,0x70,0xDB,0xFF,0xFF,0xFF,0xD8,   0,   0,
-   0,0x50,0xFF,0xFF,0xFF,0xCB,0x05,   0,   0,   0,0x16,0xF2,0xFF,0xFF,0xFF,0x1B,   0,
-   0,0x1D,0x4B,0x4B,0x4B,0x2B,   0,   0,   0,   0,   0,0xC8,0xFF,0xFF,0xFF,0x2A,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x0B,0xEC,0xFF,0xFF,0xF5,0x07,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x0D,0x38,0xBF,0xFF,0xFF,0xFF,0x86,   0,   0,
-   0,   0,   0,   0,   0,0x07,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA9,0x04,   0,   0,
-   0,   0,   0,   0,   0,0x07,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x9B,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x07,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB8,0x09,   0,   0,
-   0,   0,   0,   0,   0,   0,0x1F,0x1F,0x2E,0x5D,0xD9,0xFF,0xFF,0xFF,0xA7,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x13,0xEA,0xFF,0xFF,0xFE,0x23,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x89,0xFF,0xFF,0xFF,0x60,   0,
-   0,0x1B,0x2B,0x2B,0x2B,0x0D,   0,   0,   0,   0,   0,0x6E,0xFF,0xFF,0xFF,0x7C,   0,
-   0,0x93,0xFF,0xFF,0xFF,0x6B,   0,   0,   0,   0,   0,0x8D,0xFF,0xFF,0xFF,0x6C,   0,
-   0,0x6A,0xFF,0xFF,0xFF,0xD2,0x07,   0,   0,   0,0x10,0xE9,0xFF,0xFF,0xFF,0x3A,   0,
-   0,0x17,0xF6,0xFF,0xFF,0xFF,0xD0,0x5C,0x3F,0x67,0xDE,0xFF,0xFF,0xFF,0xD6,0x01,   0,
-   0,   0,0x6B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF8,0x3C,   0,   0,
-   0,   0,   0,0x6B,0xF7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE6,0x44,   0,   0,   0,
-   0,   0,   0,   0,0x1F,0x86,0xCB,0xF1,0xFB,0xE9,0xBB,0x6D,0x0D,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x0B,0x47,0x88,0xC2,0xE7,0xF9,0xF9,0xE8,0xBE,0x79,0x18,   0,   0,   0,   0,
+   0,   0,0x98,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF3,0x5E,   0,   0,   0,
+   0,   0,0x98,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0x4A,   0,   0,
+   0,   0,0x98,0xFF,0xD6,0x70,0x29,0x08,0x17,0x58,0xE4,0xFF,0xFF,0xFF,0xCB,   0,   0,
+   0,   0,0x7D,0x59,0x01,   0,   0,   0,   0,   0,0x3E,0xFF,0xFF,0xFF,0xFE,0x05,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x04,0xFD,0xFF,0xFF,0xFF,0x0B,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x32,0xFF,0xFF,0xFF,0xD8,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0x14,0x50,0xDC,0xFF,0xFF,0xFF,0x59,   0,   0,
+   0,   0,   0,   0,   0,0x78,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEA,0x52,   0,   0,   0,
+   0,   0,   0,   0,   0,0x78,0xFF,0xFF,0xFF,0xFF,0xFF,0xB1,0x24,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x78,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFD,0x90,0x03,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x01,0x1C,0x5A,0xE3,0xFF,0xFF,0xFF,0x97,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x23,0xF7,0xFF,0xFF,0xFE,0x27,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0x70,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x7D,0xFF,0xFF,0xFF,0x8D,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x93,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x37,0x89,0x0C,   0,   0,   0,   0,   0,   0,0x14,0xE6,0xFF,0xFF,0xFF,0x5E,   0,
+   0,0x3C,0xFF,0xF0,0x92,0x4B,0x1B,0x07,0x16,0x4E,0xD5,0xFF,0xFF,0xFF,0xF5,0x14,   0,
+   0,0x3C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x73,   0,   0,
+   0,0x3C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF8,0x76,   0,   0,   0,
+   0,0x01,0x30,0x70,0xAF,0xD0,0xE4,0xF7,0xF8,0xE7,0xBD,0x7C,0x1D,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -845,32 +731,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x03,0xCD,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x72,0xFF,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x1F,0xF4,0xFF,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0xB5,0xFF,0xFF,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,
-   0,   0,   0,   0,   0,0x10,0xE8,0xFF,0xFF,0xE4,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,
-   0,   0,   0,   0,   0,0x9A,0xFF,0xFF,0xDA,0x78,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,
-   0,   0,   0,   0,0x3D,0xFE,0xFF,0xFE,0x40,0x6F,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,
-   0,   0,   0,0x06,0xD7,0xFF,0xFF,0x99,   0,0x6F,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,
-   0,   0,   0,0x7F,0xFF,0xFF,0xE5,0x0F,   0,0x6F,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,
-   0,   0,0x28,0xF9,0xFF,0xFF,0x50,   0,   0,0x6F,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,
-   0,0x01,0xC2,0xFF,0xFF,0xAA,   0,   0,   0,0x6F,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,
-   0,0x64,0xFF,0xFF,0xEE,0x17,   0,   0,   0,0x6F,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,
-0x11,0xEE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE3,   0,
-0x20,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE3,   0,
-0x10,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE3,   0,
-0x01,0x43,0x43,0x43,0x43,0x43,0x43,0x43,0x43,0x96,0xFF,0xFF,0xFF,0xA1,0x43,0x3C,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x6F,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x6F,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x6F,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x6F,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0x08,0xD8,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0x8B,0xFF,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x37,0xFC,0xFF,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x07,0xD6,0xFF,0xFF,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x88,0xFF,0xFF,0xF5,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,
+   0,   0,   0,   0,   0,0x35,0xFC,0xFF,0xFF,0x73,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,
+   0,   0,   0,   0,0x06,0xD4,0xFF,0xFF,0xA3,0x2C,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,
+   0,   0,   0,   0,0x85,0xFF,0xFF,0xEB,0x14,0x2C,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,
+   0,   0,   0,0x32,0xFB,0xFF,0xFF,0x5C,   0,0x2C,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,
+   0,   0,0x05,0xD2,0xFF,0xFF,0xB8,   0,   0,0x2C,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,
+   0,   0,0x82,0xFF,0xFF,0xF4,0x20,   0,   0,0x2C,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,
+   0,0x30,0xFA,0xFF,0xFF,0x71,   0,   0,   0,0x2C,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,
+   0,0x8F,0xFF,0xFF,0xCA,0x03,   0,   0,   0,0x2C,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,
+   0,0x90,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x28,
+   0,0x90,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x28,
+   0,0x90,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x28,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0x2C,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0x2C,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0x2C,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0x2C,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0x2C,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -885,32 +766,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0xAF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xCF,   0,   0,
-   0,   0,   0,0xCC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xCF,   0,   0,
-   0,   0,   0,0xE9,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xCF,   0,   0,
-   0,   0,0x07,0xFE,0xFF,0xFF,0xC2,0x6F,0x6F,0x6F,0x6F,0x6F,0x6F,0x6F,0x5A,   0,   0,
-   0,   0,0x23,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x41,0xFF,0xFF,0xFF,0x5F,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x5E,0xFF,0xFF,0xFF,0x42,   0,0x0A,0x10,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x7B,0xFF,0xFF,0xFF,0x96,0xD6,0xFF,0xFF,0xF7,0xB7,0x44,   0,   0,   0,   0,
-   0,   0,0x98,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x85,   0,   0,   0,
-   0,   0,0xB5,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x56,   0,   0,
-   0,   0,0x67,0xBB,0xF5,0xE8,0x5A,0x13,0x08,0x42,0xD8,0xFF,0xFF,0xFF,0xD7,   0,   0,
-   0,   0,   0,   0,0x05,0x11,   0,   0,   0,   0,0x17,0xF5,0xFF,0xFF,0xFF,0x2C,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xA3,0xFF,0xFF,0xFF,0x5E,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x7C,0xFF,0xFF,0xFF,0x73,   0,
-   0,0x08,0x17,0x17,0x17,0x0D,   0,   0,   0,   0,   0,0x83,0xFF,0xFF,0xFF,0x71,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xAE,   0,   0,   0,   0,   0,0xAC,0xFF,0xFF,0xFF,0x56,   0,
-   0,0x15,0xFC,0xFF,0xFF,0xF5,0x26,   0,   0,   0,0x1E,0xF8,0xFF,0xFF,0xFE,0x1C,   0,
-   0,   0,0xAA,0xFF,0xFF,0xFF,0xE6,0x6C,0x3D,0x58,0xE1,0xFF,0xFF,0xFF,0xB7,   0,   0,
-   0,   0,0x1A,0xE6,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF5,0x27,   0,   0,
-   0,   0,   0,0x25,0xCF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE9,0x3B,   0,   0,   0,
-   0,   0,   0,   0,0x04,0x5A,0xB2,0xE7,0xFA,0xED,0xC8,0x79,0x0E,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x44,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x38,   0,   0,
+   0,   0,0x44,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x38,   0,   0,
+   0,   0,0x44,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x38,   0,   0,
+   0,   0,0x44,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x44,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x44,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x44,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x44,0xFF,0xFF,0xFF,0xCC,0xEF,0xFA,0xE9,0xB9,0x65,0x05,   0,   0,   0,   0,
+   0,   0,0x44,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD5,0x25,   0,   0,   0,
+   0,   0,0x44,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE4,0x18,   0,   0,
+   0,   0,0x41,0xBF,0x6B,0x32,0x16,0x07,0x29,0x8E,0xFD,0xFF,0xFF,0xFF,0xA6,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x64,0xFF,0xFF,0xFF,0xFE,0x17,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xD6,0xFF,0xFF,0xFF,0x55,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x9F,0xFF,0xFF,0xFF,0x71,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x9F,0xFF,0xFF,0xFF,0x70,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xD1,0xFF,0xFF,0xFF,0x53,   0,
+   0,   0,0x9F,0x0F,   0,   0,   0,   0,   0,   0,0x56,0xFF,0xFF,0xFF,0xFC,0x13,   0,
+   0,   0,0xF8,0xEC,0x80,0x30,0x0A,0x08,0x2D,0x89,0xFA,0xFF,0xFF,0xFF,0x9B,   0,   0,
+   0,   0,0xF8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD6,0x12,   0,   0,
+   0,   0,0xF8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB8,0x17,   0,   0,   0,
+   0,   0,0x20,0x64,0xA7,0xCF,0xE6,0xFA,0xF1,0xD5,0x9C,0x40,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -925,32 +801,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x27,0x78,0xC1,0xDE,0xF5,0x73,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x19,0xA0,0xFE,0xFF,0xFF,0xFF,0xFF,0x73,   0,   0,   0,   0,
-   0,   0,   0,   0,0x2D,0xE5,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x73,   0,   0,   0,   0,
-   0,   0,   0,0x1E,0xED,0xFF,0xFF,0xFF,0xFE,0xBE,0x80,0x64,0x28,   0,   0,   0,   0,
-   0,   0,0x01,0xC0,0xFF,0xFF,0xFF,0xC7,0x29,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x4A,0xFF,0xFF,0xFF,0xC6,0x09,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xB7,0xFF,0xFF,0xFD,0x27,   0,0x16,0x36,0x29,0x05,   0,   0,   0,   0,   0,
-   0,0x09,0xFA,0xFF,0xFF,0xBF,0x2D,0xBD,0xFE,0xFF,0xFF,0xEC,0x7F,0x06,   0,   0,   0,
-   0,0x3D,0xFF,0xFF,0xFF,0xCA,0xF7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xBA,0x06,   0,   0,
-   0,0x63,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7C,   0,   0,
-   0,0x74,0xFF,0xFF,0xFF,0xFF,0xBB,0x35,0x09,0x2F,0xCC,0xFF,0xFF,0xFF,0xED,0x06,   0,
-   0,0x82,0xFF,0xFF,0xFF,0xC6,0x04,   0,   0,   0,0x0F,0xEF,0xFF,0xFF,0xFF,0x42,   0,
-   0,0x83,0xFF,0xFF,0xFF,0x70,   0,   0,   0,   0,   0,0x93,0xFF,0xFF,0xFF,0x72,   0,
-   0,0x78,0xFF,0xFF,0xFF,0x73,   0,   0,   0,   0,   0,0x6B,0xFF,0xFF,0xFF,0x85,   0,
-   0,0x61,0xFF,0xFF,0xFF,0x89,   0,   0,   0,   0,   0,0x71,0xFF,0xFF,0xFF,0x7D,   0,
-   0,0x29,0xFF,0xFF,0xFF,0xC5,   0,   0,   0,   0,   0,0xA2,0xFF,0xFF,0xFF,0x5C,   0,
-   0,   0,0xD6,0xFF,0xFF,0xFF,0x44,   0,   0,   0,0x26,0xF9,0xFF,0xFF,0xFD,0x19,   0,
-   0,   0,0x5D,0xFF,0xFF,0xFF,0xF2,0x75,0x3E,0x65,0xEB,0xFF,0xFF,0xFF,0xA7,   0,   0,
-   0,   0,   0,0xB0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE8,0x19,   0,   0,
-   0,   0,   0,0x07,0xA7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xDB,0x28,   0,   0,   0,
-   0,   0,   0,   0,   0,0x46,0xA8,0xE3,0xF9,0xED,0xC2,0x6D,0x07,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x3D,0x94,0xD3,0xEC,0xF8,0xDD,0xB4,0x60,0x0E,   0,   0,
+   0,   0,   0,   0,0x0F,0xB0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x94,   0,   0,
+   0,   0,   0,0x0C,0xCE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x94,   0,   0,
+   0,   0,   0,0x91,0xFF,0xFF,0xFF,0xE3,0x62,0x19,0x07,0x2D,0x91,0xFA,0x94,   0,   0,
+   0,   0,0x1A,0xFC,0xFF,0xFF,0xE7,0x1B,   0,   0,   0,   0,   0,0x30,0x72,   0,   0,
+   0,   0,0x75,0xFF,0xFF,0xFF,0x66,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xB9,0xFF,0xFF,0xFE,0x10,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xE8,0xFF,0xFF,0xDF,0x18,0x90,0xDA,0xF7,0xF3,0xD0,0x81,0x0F,   0,   0,   0,
+   0,0x08,0xFF,0xFF,0xFF,0xE5,0xE6,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE0,0x24,   0,   0,
+   0,0x17,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD1,0x04,   0,
+   0,0x21,0xFF,0xFF,0xFF,0xFF,0xFF,0x93,0x17,0x0C,0x6A,0xFC,0xFF,0xFF,0xFF,0x55,   0,
+   0,0x19,0xFF,0xFF,0xFF,0xFF,0xD3,   0,   0,   0,   0,0x9B,0xFF,0xFF,0xFF,0xA2,   0,
+   0,0x0E,0xFF,0xFF,0xFF,0xFF,0x7B,   0,   0,   0,   0,0x41,0xFF,0xFF,0xFF,0xCE,   0,
+   0,0x01,0xF6,0xFF,0xFF,0xFF,0x5D,   0,   0,   0,   0,0x22,0xFF,0xFF,0xFF,0xDE,   0,
+   0,   0,0xD2,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,0x22,0xFF,0xFF,0xFF,0xD6,   0,
+   0,   0,0xA1,0xFF,0xFF,0xFF,0x7B,   0,   0,   0,   0,0x41,0xFF,0xFF,0xFF,0xBD,   0,
+   0,   0,0x55,0xFF,0xFF,0xFF,0xD3,   0,   0,   0,   0,0x9B,0xFF,0xFF,0xFF,0x85,   0,
+   0,   0,0x09,0xE5,0xFF,0xFF,0xFF,0x92,0x15,0x0C,0x69,0xFC,0xFF,0xFF,0xFE,0x27,   0,
+   0,   0,   0,0x5B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x95,   0,   0,
+   0,   0,   0,   0,0x73,0xFA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA7,0x07,   0,   0,
+   0,   0,   0,   0,   0,0x29,0x91,0xD6,0xF1,0xF9,0xE4,0xAC,0x49,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -965,32 +836,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-0x03,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x77,   0,
-0x03,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x77,   0,
-0x03,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x5A,   0,
-0x01,0x4F,0x4F,0x4F,0x4F,0x4F,0x4F,0x4F,0x4F,0x4F,0x4F,0xE2,0xFF,0xFF,0xE9,0x07,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x36,0xFF,0xFF,0xFF,0x81,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xAB,0xFF,0xFF,0xFA,0x1A,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x22,0xFC,0xFF,0xFF,0xA6,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x93,0xFF,0xFF,0xFF,0x38,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x12,0xF5,0xFF,0xFF,0xCB,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x7C,0xFF,0xFF,0xFF,0x5D,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x08,0xE9,0xFF,0xFF,0xE9,0x07,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x65,0xFF,0xFF,0xFF,0x81,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x01,0xD8,0xFF,0xFF,0xFA,0x19,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x4E,0xFF,0xFF,0xFF,0xA6,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0xC3,0xFF,0xFF,0xFF,0x38,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x37,0xFF,0xFF,0xFF,0xCB,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xAC,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x23,0xFD,0xFF,0xFF,0xE9,0x06,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x95,0xFF,0xFF,0xFF,0x81,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x13,0xF5,0xFF,0xFF,0xFA,0x19,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x7D,0xFF,0xFF,0xFF,0xA6,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x18,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x48,   0,
+   0,0x18,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x48,   0,
+   0,0x18,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x47,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x75,0xFF,0xFF,0xFF,0xF9,0x15,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xD6,0xFF,0xFF,0xFF,0xA8,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0x39,0xFF,0xFF,0xFF,0xFF,0x43,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0x9B,0xFF,0xFF,0xFF,0xDC,0x01,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0x0A,0xF1,0xFF,0xFF,0xFF,0x78,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0x5E,0xFF,0xFF,0xFF,0xFA,0x17,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0xC0,0xFF,0xFF,0xFF,0xAC,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x22,0xFE,0xFF,0xFF,0xFF,0x47,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x84,0xFF,0xFF,0xFF,0xDF,0x02,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x02,0xE2,0xFF,0xFF,0xFF,0x7B,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x47,0xFF,0xFF,0xFF,0xFB,0x1A,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA9,0xFF,0xFF,0xFF,0xB0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x12,0xF8,0xFF,0xFF,0xFF,0x4A,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x6C,0xFF,0xFF,0xFF,0xE2,0x02,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0xCE,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x2F,0xFF,0xFF,0xFF,0xFC,0x1C,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x92,0xFF,0xFF,0xFF,0xB4,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x06,0xEC,0xFF,0xFF,0xFF,0x4E,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1005,32 +871,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x19,0x80,0xC7,0xEF,0xFB,0xEC,0xC0,0x75,0x11,   0,   0,   0,   0,
-   0,   0,   0,0x4E,0xF0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE9,0x3F,   0,   0,   0,
-   0,   0,0x30,0xFA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF4,0x20,   0,   0,
-   0,   0,0xAC,0xFF,0xFF,0xFF,0xE6,0x71,0x4E,0x7D,0xEF,0xFF,0xFF,0xFF,0x98,   0,   0,
-   0,   0,0xEA,0xFF,0xFF,0xFF,0x36,   0,   0,   0,0x4E,0xFF,0xFF,0xFF,0xD9,   0,   0,
-   0,   0,0xF6,0xFF,0xFF,0xF9,0x01,   0,   0,   0,0x09,0xFF,0xFF,0xFF,0xE5,   0,   0,
-   0,   0,0xD1,0xFF,0xFF,0xFF,0x1F,   0,   0,   0,0x31,0xFF,0xFF,0xFF,0xBE,   0,   0,
-   0,   0,0x68,0xFF,0xFF,0xFF,0xC7,0x31,0x0A,0x35,0xCE,0xFF,0xFF,0xFF,0x53,   0,   0,
-   0,   0,0x01,0xA4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x98,   0,   0,   0,
-   0,   0,   0,   0,0x95,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x86,   0,   0,   0,   0,
-   0,   0,   0,0x83,0xFD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFB,0x70,   0,   0,   0,
-   0,   0,0x6A,0xFF,0xFF,0xFF,0xE8,0x72,0x4C,0x7A,0xEF,0xFF,0xFF,0xFF,0x58,   0,   0,
-   0,0x08,0xEA,0xFF,0xFF,0xF7,0x20,   0,   0,   0,0x30,0xFD,0xFF,0xFF,0xE0,0x02,   0,
-   0,0x45,0xFF,0xFF,0xFF,0xA9,   0,   0,   0,   0,   0,0xC1,0xFF,0xFF,0xFF,0x36,   0,
-   0,0x68,0xFF,0xFF,0xFF,0x89,   0,   0,   0,   0,   0,0x9E,0xFF,0xFF,0xFF,0x58,   0,
-   0,0x63,0xFF,0xFF,0xFF,0xA5,   0,   0,   0,   0,   0,0xBB,0xFF,0xFF,0xFF,0x4E,   0,
-   0,0x3A,0xFF,0xFF,0xFF,0xF1,0x1B,   0,   0,   0,0x28,0xFB,0xFF,0xFF,0xFF,0x26,   0,
-   0,0x02,0xDF,0xFF,0xFF,0xFF,0xDE,0x62,0x3F,0x6A,0xE8,0xFF,0xFF,0xFF,0xCD,   0,   0,
-   0,   0,0x4A,0xFC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF9,0x3A,   0,   0,
-   0,   0,   0,0x55,0xF1,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEC,0x4A,   0,   0,   0,
-   0,   0,   0,   0,0x18,0x80,0xC7,0xEE,0xFB,0xED,0xC4,0x7A,0x14,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x09,0x6A,0xBC,0xE9,0xFA,0xF2,0xD3,0x94,0x2B,   0,   0,   0,   0,
+   0,   0,   0,0x25,0xDA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFB,0x74,   0,   0,   0,
+   0,   0,0x08,0xDC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x56,   0,   0,
+   0,   0,0x5F,0xFF,0xFF,0xFF,0xE0,0x47,0x0C,0x1F,0x99,0xFF,0xFF,0xFF,0xD1,   0,   0,
+   0,   0,0x97,0xFF,0xFF,0xFF,0x49,   0,   0,   0,0x01,0xD0,0xFF,0xFF,0xFF,0x0A,   0,
+   0,   0,0x9C,0xFF,0xFF,0xFF,0x1A,   0,   0,   0,   0,0xA3,0xFF,0xFF,0xFF,0x0F,   0,
+   0,   0,0x72,0xFF,0xFF,0xFF,0x4B,   0,   0,   0,0x01,0xD1,0xFF,0xFF,0xE5,   0,   0,
+   0,   0,0x11,0xEE,0xFF,0xFF,0xE0,0x46,0x0B,0x1F,0x98,0xFF,0xFF,0xFF,0x71,   0,   0,
+   0,   0,   0,0x31,0xE1,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFD,0x8A,0x01,   0,   0,
+   0,   0,   0,   0,0x1C,0xD2,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0x6E,   0,   0,   0,   0,
+   0,   0,   0,0x56,0xF7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xBB,0x0A,   0,   0,
+   0,   0,0x3D,0xFC,0xFF,0xFF,0xDF,0x49,0x0E,0x26,0x9B,0xFF,0xFF,0xFF,0xAF,   0,   0,
+   0,   0,0xBE,0xFF,0xFF,0xFB,0x29,   0,   0,   0,   0,0xB1,0xFF,0xFF,0xFF,0x35,   0,
+   0,0x06,0xFD,0xFF,0xFF,0xBE,   0,   0,   0,   0,   0,0x4B,0xFF,0xFF,0xFF,0x7A,   0,
+   0,0x23,0xFF,0xFF,0xFF,0xA1,   0,   0,   0,   0,   0,0x2E,0xFF,0xFF,0xFF,0x9A,   0,
+   0,0x1C,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,   0,   0,0x4C,0xFF,0xFF,0xFF,0x92,   0,
+   0,0x03,0xF0,0xFF,0xFF,0xFB,0x29,   0,   0,   0,   0,0xB5,0xFF,0xFF,0xFF,0x6A,   0,
+   0,   0,0xA2,0xFF,0xFF,0xFF,0xDF,0x49,0x0E,0x25,0x9D,0xFF,0xFF,0xFF,0xFA,0x1E,   0,
+   0,   0,0x23,0xF1,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x8C,   0,   0,
+   0,   0,   0,0x3E,0xE8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x9A,0x03,   0,   0,
+   0,   0,   0,   0,0x10,0x74,0xC0,0xEB,0xFB,0xF3,0xD8,0x9E,0x3A,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1045,32 +906,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x0B,0x75,0xC7,0xED,0xF7,0xDC,0x96,0x29,   0,   0,   0,   0,   0,
-   0,   0,   0,0x31,0xE3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFA,0x71,   0,   0,   0,   0,
-   0,   0,0x22,0xEF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x65,   0,   0,   0,
-   0,   0,0xBA,0xFF,0xFF,0xFF,0xE5,0x66,0x4E,0xA3,0xFF,0xFF,0xFF,0xF2,0x17,   0,   0,
-   0,0x2B,0xFF,0xFF,0xFF,0xF4,0x20,   0,   0,   0,0x90,0xFF,0xFF,0xFF,0x7A,   0,   0,
-   0,0x70,0xFF,0xFF,0xFF,0x94,   0,   0,   0,   0,0x15,0xFC,0xFF,0xFF,0xCB,   0,   0,
-   0,0x92,0xFF,0xFF,0xFF,0x5F,   0,   0,   0,   0,   0,0xD6,0xFF,0xFF,0xFB,0x07,   0,
-   0,0x99,0xFF,0xFF,0xFF,0x59,   0,   0,   0,   0,   0,0xC2,0xFF,0xFF,0xFF,0x1B,   0,
-   0,0x84,0xFF,0xFF,0xFF,0x82,   0,   0,   0,   0,   0,0xC0,0xFF,0xFF,0xFF,0x2A,   0,
-   0,0x50,0xFF,0xFF,0xFF,0xE6,0x0C,   0,   0,   0,0x22,0xF5,0xFF,0xFF,0xFF,0x2B,   0,
-   0,0x09,0xEE,0xFF,0xFF,0xFF,0xCD,0x41,0x29,0x61,0xE4,0xFF,0xFF,0xFF,0xFF,0x1E,   0,
-   0,   0,0x6C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x0E,   0,
-   0,   0,0x01,0x92,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEF,0xF1,0xFF,0xFF,0xED,   0,   0,
-   0,   0,   0,   0,0x4A,0xB4,0xEA,0xF9,0xE0,0x97,0x27,0xFA,0xFF,0xFF,0xB7,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0x74,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x0E,0xDA,0xFF,0xFF,0xF9,0x15,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x2A,0xCB,0xFF,0xFF,0xFF,0x8E,   0,   0,   0,
-   0,   0,   0,   0,0x34,0x67,0x83,0xBE,0xFE,0xFF,0xFF,0xFF,0xD7,0x09,   0,   0,   0,
-   0,   0,   0,   0,0x8F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD4,0x1A,   0,   0,   0,   0,
-   0,   0,   0,   0,0x8F,0xFF,0xFF,0xFF,0xFF,0xFB,0x92,0x10,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x8F,0xF0,0xDB,0xB8,0x71,0x21,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x17,0x86,0xCE,0xF0,0xF8,0xE4,0xB4,0x60,0x03,   0,   0,   0,   0,
+   0,   0,   0,0x47,0xF1,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xCC,0x16,   0,   0,   0,
+   0,   0,0x2B,0xF6,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xCD,0x04,   0,   0,
+   0,   0,0xB2,0xFF,0xFF,0xFF,0xBC,0x26,0x07,0x49,0xEB,0xFF,0xFF,0xFF,0x66,   0,   0,
+   0,0x11,0xFD,0xFF,0xFF,0xF7,0x14,   0,   0,   0,0x64,0xFF,0xFF,0xFF,0xCD,   0,   0,
+   0,0x47,0xFF,0xFF,0xFF,0xB3,   0,   0,   0,   0,0x0C,0xFF,0xFF,0xFF,0xFF,0x1A,   0,
+   0,0x60,0xFF,0xFF,0xFF,0x95,   0,   0,   0,   0,   0,0xED,0xFF,0xFF,0xFF,0x49,   0,
+   0,0x67,0xFF,0xFF,0xFF,0x94,   0,   0,   0,   0,   0,0xEE,0xFF,0xFF,0xFF,0x70,   0,
+   0,0x57,0xFF,0xFF,0xFF,0xB3,   0,   0,   0,   0,0x0C,0xFF,0xFF,0xFF,0xFF,0x85,   0,
+   0,0x2B,0xFF,0xFF,0xFF,0xF7,0x14,   0,   0,   0,0x64,0xFF,0xFF,0xFF,0xFF,0x90,   0,
+   0,0x01,0xDD,0xFF,0xFF,0xFF,0xBC,0x25,0x06,0x48,0xEB,0xFF,0xFF,0xFF,0xFF,0x98,   0,
+   0,   0,0x60,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x8D,   0,
+   0,   0,   0,0x91,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD4,0xFF,0xFF,0xFF,0x7F,   0,
+   0,   0,   0,   0,0x49,0xB2,0xE9,0xFB,0xED,0xBC,0x56,0x69,0xFF,0xFF,0xFF,0x5E,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x2F,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x06,0xE7,0xFF,0xFF,0xE7,0x03,   0,
+   0,   0,0x1E,0x7E,0x01,   0,   0,   0,   0,   0,0x89,0xFF,0xFF,0xFF,0x8C,   0,   0,
+   0,   0,0x20,0xFF,0xC9,0x4F,0x0F,0x0A,0x36,0xA4,0xFF,0xFF,0xFF,0xEE,0x17,   0,   0,
+   0,   0,0x20,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFB,0x53,   0,   0,   0,
+   0,   0,0x20,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE7,0x4C,   0,   0,   0,   0,
+   0,   0,   0,0x39,0x93,0xD0,0xEF,0xF6,0xE2,0xB5,0x6B,0x0B,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1091,26 +947,21 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x06,0x31,0x29,0x01,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x21,0xDA,0xFF,0xFF,0xC2,0x0A,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x73,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0xC8,0xFF,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x8B,0xFF,0xFF,0xFF,0xFF,0x5B,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x0B,0x9F,0xEE,0xE7,0x82,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x06,0x31,0x29,0x01,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x21,0xDA,0xFF,0xFF,0xC2,0x0A,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x73,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0xC8,0xFF,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x8B,0xFF,0xFF,0xFF,0xFF,0x5B,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x0B,0x9F,0xEE,0xE7,0x82,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1131,33 +982,28 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x17,0x38,0x13,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFC,0xFF,0xF8,0x5F,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x1B,0xFC,0xFF,0xFF,0xFF,0xF5,0x09,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x3C,0xFF,0xFF,0xFF,0xFF,0xFF,0x23,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x10,0xEF,0xFF,0xFF,0xFF,0xE3,0x04,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x41,0xD1,0xF5,0xC9,0x33,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xA5,0xFF,0xFF,0xFF,0xFF,0x10,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xCE,0xFF,0xFF,0xFF,0xAC,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFA,0xFF,0xFF,0xFC,0x28,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x3A,0xFF,0xFF,0xFF,0x9D,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x70,0xFF,0xFF,0xF8,0x1E,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0xA5,0xFF,0xFF,0x8F,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x8B,0xFF,0xFF,0xFF,0x22,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x8B,0xFF,0xFF,0xFF,0x21,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x8B,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x8F,0xFF,0xFF,0xFF,0x16,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x9E,0xFF,0xFF,0xF6,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0xC8,0xFF,0xFF,0xB3,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x19,0xFB,0xFF,0xFF,0x53,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x7F,0xFF,0xFF,0xC5,0x01,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x69,0xEF,0xEA,0x25,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x11,0x28,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
 // '<'
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1169,26 +1015,21 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x1F,0x58,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x01,0x47,0xB1,0xFD,0xBB,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x12,0x72,0xDB,0xFF,0xFF,0xFF,0xBB,   0,   0,
-   0,   0,   0,   0,   0,   0,0x34,0x9E,0xF6,0xFF,0xFF,0xFF,0xFF,0xFF,0xBB,   0,   0,
-   0,   0,   0,0x08,0x5F,0xC9,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,0xA0,0x3E,   0,   0,
-   0,   0,0x77,0xEC,0xFF,0xFF,0xFF,0xFF,0xFF,0xF3,0xA5,0x4E,0x06,   0,   0,   0,   0,
-   0,   0,0xCB,0xFF,0xFF,0xFF,0xF6,0xAB,0x54,0x09,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xCB,0xFF,0xFF,0xFF,0xB1,0x4A,0x06,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xBB,0xFF,0xFF,0xFF,0xFF,0xFF,0xEF,0x9F,0x49,0x05,   0,   0,   0,   0,   0,
-   0,   0,0x02,0x4D,0xB7,0xFE,0xFF,0xFF,0xFF,0xFF,0xFF,0xEF,0x9E,0x48,0x05,   0,   0,
-   0,   0,   0,   0,   0,0x23,0x8B,0xED,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB5,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x08,0x5F,0xC9,0xFF,0xFF,0xFF,0xFF,0xBB,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x33,0x9D,0xF6,0xFF,0xBB,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x11,0x71,0x96,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x05,0x54,0xB8,0x35,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x28,0x8C,0xEA,0xFF,0xFF,0x38,
+   0,   0,   0,   0,   0,   0,   0,   0,0x0A,0x60,0xC4,0xFF,0xFF,0xFF,0xFF,0xFF,0x38,
+   0,   0,   0,   0,   0,   0,0x34,0x98,0xF1,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC5,0x1F,
+   0,   0,   0,0x11,0x6C,0xD0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD6,0x7B,0x21,   0,   0,
+   0,0x39,0xA4,0xF7,0xFF,0xFF,0xFF,0xFF,0xFF,0xE4,0x8C,0x31,   0,   0,   0,   0,   0,
+   0,0xC0,0xFF,0xFF,0xFF,0xFF,0xEF,0x9D,0x42,0x02,   0,   0,   0,   0,   0,   0,   0,
+   0,0xC0,0xFF,0xFF,0xFF,0x9C,0x0C,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0xC0,0xFF,0xFF,0xFF,0xFF,0xEA,0x95,0x3A,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x3D,0xA9,0xF9,0xFF,0xFF,0xFF,0xFF,0xFF,0xDF,0x85,0x2A,   0,   0,   0,   0,   0,
+   0,   0,   0,0x13,0x70,0xD3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD0,0x75,0x1C,   0,   0,
+   0,   0,   0,   0,   0,   0,0x38,0x9B,0xF2,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0xC0,0x1E,
+   0,   0,   0,   0,   0,   0,   0,   0,0x0B,0x63,0xC6,0xFF,0xFF,0xFF,0xFF,0xFF,0x38,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x2A,0x8E,0xEB,0xFF,0xFF,0x38,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x06,0x55,0xB9,0x35,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1212,20 +1053,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,0xC0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x38,
+   0,0xC0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x38,
+   0,0xC0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x38,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x3A,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x30,   0,
-   0,   0,0xC3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA3,   0,
-   0,   0,0xC3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA3,   0,
-   0,   0,0xC3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA3,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x3A,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x30,   0,
-   0,   0,0xC3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA3,   0,
-   0,   0,0xC3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA3,   0,
-   0,   0,0xC3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA3,   0,
+   0,0xC0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x38,
+   0,0xC0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x38,
+   0,0xC0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x38,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1249,26 +1085,21 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x58,0x22,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xB7,0xFE,0xB7,0x4F,0x03,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xB7,0xFF,0xFF,0xFF,0xE4,0x7F,0x1B,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xB7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFC,0xAF,0x47,0x01,   0,   0,   0,   0,   0,
-   0,   0,0x38,0x96,0xE8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xDD,0x76,0x15,   0,   0,   0,
-   0,   0,   0,   0,0x02,0x3F,0x93,0xE5,0xFF,0xFF,0xFF,0xFF,0xFF,0xF9,0xA6,0x03,   0,
-   0,   0,   0,   0,   0,   0,   0,0x01,0x3B,0x8F,0xE3,0xFF,0xFF,0xFF,0xFF,0x07,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x03,0x42,0x9A,0xFA,0xFF,0xFF,0xFF,0x07,   0,
-   0,   0,   0,   0,   0,0x03,0x41,0x96,0xE9,0xFF,0xFF,0xFF,0xFF,0xFF,0xF2,0x06,   0,
-   0,   0,0x02,0x3F,0x95,0xE9,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xCF,0x67,0x0C,   0,   0,
-   0,   0,0xAE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF6,0xA0,0x37,   0,   0,   0,   0,   0,
-   0,   0,0xB7,0xFF,0xFF,0xFF,0xFF,0xD7,0x70,0x11,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xB7,0xFF,0xFA,0xA8,0x40,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x97,0x79,0x16,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0xA3,0x83,0x20,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0xC0,0xFF,0xFE,0xBB,0x57,0x06,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0xC0,0xFF,0xFF,0xFF,0xFF,0xEC,0x8F,0x2B,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x7C,0xEF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC7,0x63,0x0C,   0,   0,   0,   0,   0,
+   0,   0,0x07,0x51,0xAC,0xF7,0xFF,0xFF,0xFF,0xFF,0xFF,0xF3,0x9B,0x37,   0,   0,   0,
+   0,   0,   0,   0,   0,0x0F,0x62,0xBD,0xFD,0xFF,0xFF,0xFF,0xFF,0xFF,0xD3,0x6F,0x0B,
+   0,   0,   0,   0,   0,   0,   0,   0,0x1A,0x73,0xCE,0xFF,0xFF,0xFF,0xFF,0xFF,0x38,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x4B,0xE9,0xFF,0xFF,0xFF,0x38,
+   0,   0,   0,   0,   0,   0,   0,   0,0x15,0x6B,0xC6,0xFF,0xFF,0xFF,0xFF,0xFF,0x38,
+   0,   0,   0,   0,   0,0x0B,0x5B,0xB6,0xFB,0xFF,0xFF,0xFF,0xFF,0xFF,0xD7,0x74,0x0C,
+   0,   0,0x05,0x4B,0xA6,0xF5,0xFF,0xFF,0xFF,0xFF,0xFF,0xF4,0x9F,0x3B,   0,   0,   0,
+   0,0x79,0xEB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xCA,0x66,0x0D,   0,   0,   0,   0,   0,
+   0,0xC0,0xFF,0xFF,0xFF,0xFF,0xED,0x91,0x2D,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0xC0,0xFF,0xFE,0xBC,0x59,0x07,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0xA4,0x84,0x21,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1285,32 +1116,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,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x37,0x96,0xD7,0xF4,0xF7,0xE0,0xAB,0x4B,   0,   0,   0,   0,
+   0,   0,   0,0x27,0xBB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xAA,0x06,   0,   0,
+   0,   0,   0,0xB4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x82,   0,   0,
+   0,   0,   0,0xB4,0xFF,0xB7,0x57,0x1A,0x06,0x23,0xA3,0xFF,0xFF,0xFF,0xE9,   0,   0,
+   0,   0,   0,0x8A,0x3A,   0,   0,   0,   0,   0,0x0A,0xFD,0xFF,0xFF,0xFF,0x0C,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x17,0xFF,0xFF,0xFF,0xF4,0x01,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0x01,0xA6,0xFF,0xFF,0xFF,0x98,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0x01,0x95,0xFF,0xFF,0xFF,0xD7,0x0E,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x01,0x9E,0xFF,0xFF,0xFF,0xD8,0x19,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x90,0xFF,0xFF,0xFF,0xD1,0x16,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x3B,0xFF,0xFF,0xFF,0xD8,0x14,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x45,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xBA,0xFF,0xFF,0xFF,0x10,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xC4,0xFF,0xFF,0xFF,0x04,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xC4,0xFF,0xFF,0xFF,0x04,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x01,0x52,0xAB,0xE1,0xF8,0xF6,0xE1,0xAE,0x5A,0x03,   0,   0,   0,
-   0,   0,   0,0x11,0xC1,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xCD,0x18,   0,   0,
-   0,   0,0x01,0xBF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC8,0x01,   0,
-   0,   0,0x4C,0xFF,0xFF,0xFF,0xFF,0xAC,0x63,0x66,0xAB,0xFF,0xFF,0xFF,0xFF,0x46,   0,
-   0,   0,0x97,0xFF,0xFF,0xFF,0x9C,   0,   0,   0,   0,0xAD,0xFF,0xFF,0xFF,0x83,   0,
-   0,   0,0x80,0xB7,0xB7,0xB7,0x37,   0,   0,   0,   0,0x6A,0xFF,0xFF,0xFF,0x95,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x8B,0xFF,0xFF,0xFF,0x7B,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x17,0xEF,0xFF,0xFF,0xFB,0x27,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x0A,0xC7,0xFF,0xFF,0xFF,0x90,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x0F,0xC2,0xFF,0xFF,0xFF,0xBD,0x06,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x10,0xD3,0xFF,0xFF,0xFF,0xBC,0x0D,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x8A,0xFF,0xFF,0xFF,0xB0,0x06,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0xD0,0xFF,0xFF,0xE8,0x0A,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xA7,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x77,0x7F,0x7F,0x4E,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x17,0x59,0x43,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x1E,0xEE,0xFF,0xFF,0x9B,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x74,0xFF,0xFF,0xFF,0xFD,0x09,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x5F,0xFF,0xFF,0xFF,0xEE,0x02,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x04,0xA0,0xF2,0xDC,0x48,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xC4,0xFF,0xFF,0xFF,0x04,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xC4,0xFF,0xFF,0xFF,0x04,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xC4,0xFF,0xFF,0xFF,0x04,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xC4,0xFF,0xFF,0xFF,0x04,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1326,35 +1152,30 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x06,0x5A,0xB7,0xE2,0xF8,0xE4,0xB0,0x51,   0,   0,   0,   0,
-   0,   0,   0,   0,0x2D,0xD0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xBA,0x0E,   0,   0,
-   0,   0,   0,0x31,0xF0,0xFF,0xF1,0x91,0x51,0x3E,0x57,0xA0,0xFB,0xFF,0xC6,0x03,   0,
-   0,   0,0x13,0xE8,0xFF,0xCC,0x1E,   0,   0,   0,   0,   0,0x34,0xEE,0xFF,0x70,   0,
-   0,   0,0xA2,0xFF,0xE1,0x15,   0,   0,0x0C,0x2B,0x20,   0,   0,0x63,0xFF,0xE0,0x01,
-   0,0x24,0xFE,0xFF,0x52,   0,0x0B,0x98,0xF8,0xFF,0xFF,0xD7,0x3C,0x08,0xF2,0xFF,0x35,
-   0,0x8D,0xFF,0xDA,   0,0x01,0xBA,0xFF,0xFF,0xFF,0xFF,0xFF,0x95,   0,0xBF,0xFF,0x69,
-   0,0xD9,0xFF,0x81,   0,0x61,0xFF,0xFF,0x8A,0x17,0xB4,0xFF,0x7F,   0,0x9F,0xFF,0x82,
-0x19,0xFF,0xFF,0x44,   0,0xCE,0xFF,0xBF,   0,   0,0xCA,0xFF,0x69,   0,0x97,0xFF,0x8C,
-0x3F,0xFF,0xFF,0x17,0x19,0xFF,0xFF,0x5F,   0,   0,0xE1,0xFF,0x53,   0,0x9D,0xFF,0x7A,
-0x5A,0xFF,0xFD,0x02,0x47,0xFF,0xFF,0x2E,   0,   0,0xF8,0xFF,0x3C,   0,0xAD,0xFF,0x5E,
-0x64,0xFF,0xF5,   0,0x55,0xFF,0xFF,0x1D,   0,0x10,0xFF,0xFF,0x26,   0,0xCC,0xFF,0x3C,
-0x5D,0xFF,0xFB,   0,0x52,0xFF,0xFF,0x31,   0,0x28,0xFF,0xFF,0x11,0x10,0xFA,0xF5,0x07,
-0x4C,0xFF,0xFF,0x13,0x34,0xFF,0xFF,0x9A,0x0E,0x87,0xFF,0xFF,0x22,0x8D,0xFF,0x9F,   0,
-0x24,0xFF,0xFF,0x40,0x01,0xD4,0xFF,0xFF,0xFF,0xFD,0xF2,0xFF,0xFF,0xFF,0xF2,0x1F,   0,
-0x02,0xE9,0xFF,0x8F,   0,0x2A,0xD6,0xFF,0xF1,0x62,0x48,0xEC,0xFF,0xDD,0x3D,   0,   0,
-   0,0x95,0xFF,0xF4,0x1B,   0,   0,0x16,0x05,   0,   0,0x05,0x15,   0,   0,   0,   0,
-   0,0x21,0xF7,0xFF,0xCD,0x15,   0,   0,   0,   0,   0,0x04,   0,   0,   0,   0,   0,
-   0,   0,0x6C,0xFF,0xFF,0xEC,0x8A,0x4F,0x3C,0x50,0x8C,0xE0,0x08,   0,   0,   0,   0,
-   0,   0,   0,0x69,0xF5,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x3A,   0,   0,   0,   0,
-   0,   0,   0,   0,0x1E,0x82,0xCC,0xEA,0xFB,0xEA,0xB7,0x5F,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x11,0x69,0xB9,0xE0,0xF8,0xEF,0xCA,0x7D,0x10,   0,   0,   0,
+   0,   0,   0,   0,0x5E,0xEB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE9,0x37,   0,   0,
+   0,   0,   0,0x82,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEE,0x1F,   0,
+   0,   0,0x6C,0xFF,0xFF,0xFF,0xDA,0x67,0x1F,0x06,0x16,0x5A,0xE2,0xFF,0xFF,0xA6,   0,
+   0,0x22,0xF5,0xFF,0xFF,0xAB,0x0A,   0,   0,   0,   0,   0,0x1C,0xEF,0xFF,0xFB,0x0D,
+   0,0xA1,0xFF,0xFF,0xC4,0x06,   0,   0,   0,   0,   0,   0,   0,0x8F,0xFF,0xFF,0x43,
+0x11,0xF7,0xFF,0xFB,0x29,   0,   0,0x12,0x8C,0xDD,0xF8,0xE1,0x7E,0x68,0xFF,0xFF,0x5C,
+0x5B,0xFF,0xFF,0xAF,   0,   0,0x1A,0xDC,0xFF,0xFF,0xFF,0xFF,0xFF,0xDF,0xFF,0xFF,0x67,
+0x92,0xFF,0xFF,0x58,   0,   0,0xB5,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x68,
+0xC1,0xFF,0xFF,0x20,   0,0x28,0xFF,0xFF,0xFF,0x84,0x1A,0x13,0x6A,0xF9,0xFF,0xFF,0x68,
+0xD5,0xFF,0xFC,   0,   0,0x68,0xFF,0xFF,0xB7,   0,   0,   0,   0,0x8D,0xFF,0xFF,0x68,
+0xE4,0xFF,0xEE,   0,   0,0x84,0xFF,0xFF,0x75,   0,   0,   0,   0,0x4A,0xFF,0xFF,0x68,
+0xE2,0xFF,0xF1,   0,   0,0x83,0xFF,0xFF,0x75,   0,   0,   0,   0,0x4B,0xFF,0xFF,0x68,
+0xD0,0xFF,0xFF,0x04,   0,0x67,0xFF,0xFF,0xB7,   0,   0,   0,   0,0x8D,0xFF,0xFF,0x68,
+0xBA,0xFF,0xFF,0x2D,   0,0x26,0xFF,0xFF,0xFF,0x84,0x19,0x13,0x69,0xF9,0xFF,0xFF,0x68,
+0x85,0xFF,0xFF,0x6B,   0,   0,0xB2,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x68,
+0x48,0xFF,0xFF,0xCF,   0,   0,0x19,0xDB,0xFF,0xFF,0xFF,0xFF,0xFF,0xE7,0xFF,0xFF,0x68,
+0x05,0xE5,0xFF,0xFF,0x54,   0,   0,0x11,0x8B,0xDE,0xFA,0xE6,0x8C,0x63,0xFF,0xFF,0x68,
+   0,0x79,0xFF,0xFF,0xEC,0x24,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x0A,0xD7,0xFF,0xFF,0xE8,0x3C,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x2F,0xF4,0xFF,0xFF,0xFF,0xAD,0x54,0x1D,0x07,0x14,0x31,0x70,0xCE,0x4F,   0,
+   0,   0,   0,0x35,0xEA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xDB,0x06,
+   0,   0,   0,   0,0x1E,0xA6,0xFE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xCA,0x1A,
+   0,   0,   0,   0,   0,   0,0x2B,0x7C,0xC1,0xE1,0xF6,0xF6,0xDD,0xA6,0x4D,0x02,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1365,32 +1186,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x0B,0xF6,0xFF,0xFF,0xE9,0x02,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0xFF,0x3C,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0xA6,0xFF,0xFF,0xFF,0xFF,0x8D,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x06,0xF1,0xFF,0xFF,0xFF,0xFF,0xDE,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x4B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x2E,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x9D,0xFF,0xFF,0xF0,0xFB,0xFF,0xFF,0x7F,   0,   0,   0,   0,
-   0,   0,   0,   0,0x03,0xEC,0xFF,0xFF,0xA6,0xC2,0xFF,0xFF,0xD0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x42,0xFF,0xFF,0xFF,0x5D,0x7A,0xFF,0xFF,0xFF,0x21,   0,   0,   0,
-   0,   0,   0,   0,0x95,0xFF,0xFF,0xFE,0x16,0x32,0xFF,0xFF,0xFF,0x71,   0,   0,   0,
-   0,   0,   0,0x01,0xE6,0xFF,0xFF,0xC9,   0,0x01,0xE9,0xFF,0xFF,0xC2,   0,   0,   0,
-   0,   0,   0,0x3A,0xFF,0xFF,0xFF,0x7F,   0,   0,0xA3,0xFF,0xFF,0xFD,0x16,   0,   0,
-   0,   0,   0,0x8C,0xFF,0xFF,0xFF,0x35,   0,   0,0x5B,0xFF,0xFF,0xFF,0x64,   0,   0,
-   0,   0,   0,0xDE,0xFF,0xFF,0xEA,0x02,   0,   0,0x15,0xFE,0xFF,0xFF,0xB4,   0,   0,
-   0,   0,0x31,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF8,0x0D,   0,
-   0,   0,0x84,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x56,   0,
-   0,   0,0xD6,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA7,   0,
-   0,0x29,0xFF,0xFF,0xFF,0xDC,0x77,0x77,0x77,0x77,0x77,0x77,0xF6,0xFF,0xFF,0xF1,0x06,
-   0,0x7B,0xFF,0xFF,0xFF,0x88,   0,   0,   0,   0,   0,   0,0xB9,0xFF,0xFF,0xFF,0x48,
-   0,0xCE,0xFF,0xFF,0xFF,0x43,   0,   0,   0,   0,   0,   0,0x75,0xFF,0xFF,0xFF,0x99,
-0x20,0xFF,0xFF,0xFF,0xF6,0x08,   0,   0,   0,   0,   0,   0,0x31,0xFF,0xFF,0xFF,0xE8,
-0x72,0xFF,0xFF,0xFF,0xB9,   0,   0,   0,   0,   0,   0,   0,0x01,0xEC,0xFF,0xFF,0xFF,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x04,0xF2,0xFF,0xFF,0xFF,0xFF,0x6A,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x3D,0xFF,0xFF,0xFF,0xFF,0xFF,0xB0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x82,0xFF,0xFF,0xFF,0xFF,0xFF,0xF1,0x04,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0xC8,0xFF,0xFF,0xF9,0xFF,0xFF,0xFF,0x3B,   0,   0,   0,   0,
+   0,   0,   0,   0,0x10,0xFC,0xFF,0xFF,0x9B,0xFF,0xFF,0xFF,0x81,   0,   0,   0,   0,
+   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x49,0xD8,0xFF,0xFF,0xC7,   0,   0,   0,   0,
+   0,   0,   0,   0,0x98,0xFF,0xFF,0xFD,0x0F,0x9B,0xFF,0xFF,0xFC,0x10,   0,   0,   0,
+   0,   0,   0,   0,0xDD,0xFF,0xFF,0xD0,   0,0x5E,0xFF,0xFF,0xFF,0x52,   0,   0,   0,
+   0,   0,   0,0x23,0xFF,0xFF,0xFF,0x93,   0,0x21,0xFF,0xFF,0xFF,0x98,   0,   0,   0,
+   0,   0,   0,0x69,0xFF,0xFF,0xFF,0x57,   0,   0,0xE4,0xFF,0xFF,0xDE,   0,   0,   0,
+   0,   0,   0,0xAE,0xFF,0xFF,0xFF,0x1A,   0,   0,0xA7,0xFF,0xFF,0xFF,0x23,   0,   0,
+   0,   0,0x03,0xF0,0xFF,0xFF,0xDE,   0,   0,   0,0x6A,0xFF,0xFF,0xFF,0x69,   0,   0,
+   0,   0,0x39,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xAF,   0,   0,
+   0,   0,0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,0x03,   0,
+   0,   0,0xC4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x3A,   0,
+   0,0x0E,0xFB,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,0x61,0xFF,0xFF,0xFF,0x80,   0,
+   0,0x4F,0xFF,0xFF,0xFF,0x99,   0,   0,   0,   0,   0,0x29,0xFF,0xFF,0xFF,0xC6,   0,
+   0,0x95,0xFF,0xFF,0xFF,0x62,   0,   0,   0,   0,   0,0x01,0xF0,0xFF,0xFF,0xFC,0x0F,
+   0,0xDA,0xFF,0xFF,0xFF,0x2C,   0,   0,   0,   0,   0,   0,0xBB,0xFF,0xFF,0xFF,0x51,
+0x1F,0xFF,0xFF,0xFF,0xF3,0x02,   0,   0,   0,   0,   0,   0,0x83,0xFF,0xFF,0xFF,0x97,
+0x65,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,   0,   0,   0,   0,0x4C,0xFF,0xFF,0xFF,0xDD,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1405,32 +1221,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x2B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF4,0xDF,0xB1,0x67,0x0E,   0,   0,   0,
-   0,0x2B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE8,0x48,   0,   0,
-   0,0x2B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFA,0x37,   0,
-   0,0x2B,0xFF,0xFF,0xFF,0xE1,0x5B,0x5B,0x5C,0x69,0x9F,0xF8,0xFF,0xFF,0xFF,0xC2,   0,
-   0,0x2B,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,   0,   0,0x49,0xFF,0xFF,0xFF,0xFE,0x12,
-   0,0x2B,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,   0,   0,   0,0xDF,0xFF,0xFF,0xFF,0x2E,
-   0,0x2B,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,   0,   0,   0,0xD2,0xFF,0xFF,0xFF,0x26,
-   0,0x2B,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,   0,   0,0x20,0xF9,0xFF,0xFF,0xE7,0x01,
-   0,0x2B,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,0x18,0x4A,0xD4,0xFF,0xFF,0xFF,0x6F,   0,
-   0,0x2B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0x8A,0x01,   0,
-   0,0x2B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xBA,0x24,   0,   0,
-   0,0x2B,0xFF,0xFF,0xFF,0xFE,0xF7,0xF7,0xF7,0xFA,0xFF,0xFF,0xFF,0xFF,0xF8,0x49,   0,
-   0,0x2B,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,0x01,0x1E,0x7E,0xFD,0xFF,0xFF,0xF4,0x12,
-   0,0x2B,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,   0,   0,   0,0x9E,0xFF,0xFF,0xFF,0x72,
-   0,0x2B,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0x9E,
-   0,0x2B,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,   0,   0,   0,0x6A,0xFF,0xFF,0xFF,0xA2,
-   0,0x2B,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,   0,   0,0x08,0xCF,0xFF,0xFF,0xFF,0x7F,
-   0,0x2B,0xFF,0xFF,0xFF,0xDE,0x4B,0x4B,0x4B,0x53,0x76,0xDA,0xFF,0xFF,0xFF,0xFE,0x2D,
-   0,0x2B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x97,   0,
-   0,0x2B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0x97,0x03,   0,
-   0,0x2B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFD,0xEF,0xCD,0x93,0x31,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x3C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0xF3,0xDE,0xB2,0x66,0x09,   0,   0,   0,
+   0,0x3C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE2,0x31,   0,   0,
+   0,0x3C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE7,0x0F,   0,
+   0,0x3C,0xFF,0xFF,0xFF,0xD0,   0,   0,0x02,0x1B,0x75,0xFE,0xFF,0xFF,0xFF,0x67,   0,
+   0,0x3C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,0xAD,0xFF,0xFF,0xFF,0x98,   0,
+   0,0x3C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,0x86,0xFF,0xFF,0xFF,0xA0,   0,
+   0,0x3C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,0xA9,0xFF,0xFF,0xFF,0x7A,   0,
+   0,0x3C,0xFF,0xFF,0xFF,0xD0,   0,   0,0x02,0x18,0x6C,0xFD,0xFF,0xFF,0xF5,0x1E,   0,
+   0,0x3C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE0,0x40,   0,   0,
+   0,0x3C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF5,0x9B,0x1C,   0,   0,   0,
+   0,0x3C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF7,0x78,   0,   0,
+   0,0x3C,0xFF,0xFF,0xFF,0xD0,   0,   0,0x01,0x14,0x56,0xE6,0xFF,0xFF,0xFF,0x70,   0,
+   0,0x3C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,0x3F,0xFF,0xFF,0xFF,0xEE,0x08,
+   0,0x3C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,0xEE,0xFF,0xFF,0xFF,0x3F,
+   0,0x3C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,0xD8,0xFF,0xFF,0xFF,0x5E,
+   0,0x3C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,0xE7,0xFF,0xFF,0xFF,0x5F,
+   0,0x3C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,0x2A,0xFF,0xFF,0xFF,0xFF,0x45,
+   0,0x3C,0xFF,0xFF,0xFF,0xD0,   0,   0,0x01,0x10,0x47,0xD5,0xFF,0xFF,0xFF,0xF7,0x0B,
+   0,0x3C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x86,   0,
+   0,0x3C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0x9A,0x03,   0,
+   0,0x3C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF6,0xE6,0xC1,0x89,0x30,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1445,32 +1256,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x36,0xA3,0xE2,0xFA,0xF0,0xD4,0x93,0x2B,   0,   0,   0,   0,
-   0,   0,   0,0x0B,0xAB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0x8B,0x03,   0,   0,
-   0,   0,0x03,0xBB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x91,   0,   0,
-   0,   0,0x78,0xFF,0xFF,0xFF,0xFA,0x94,0x5D,0x72,0xBC,0xFF,0xFF,0xFF,0xFF,0x36,   0,
-   0,0x0C,0xEF,0xFF,0xFF,0xFF,0x51,   0,   0,   0,   0,0x91,0xFF,0xFF,0xFF,0xA5,   0,
-   0,0x51,0xFF,0xFF,0xFF,0xC8,   0,   0,   0,   0,   0,0x11,0xFE,0xFF,0xFF,0xF0,0x01,
-   0,0x99,0xFF,0xFF,0xFF,0x6F,   0,   0,   0,   0,   0,   0,0xCF,0xEF,0xEF,0xEF,0x1A,
-   0,0xBE,0xFF,0xFF,0xFF,0x40,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0xD3,0xFF,0xFF,0xFF,0x2E,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0xDF,0xFF,0xFF,0xFF,0x28,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0xDF,0xFF,0xFF,0xFF,0x27,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0xDF,0xFF,0xFF,0xFF,0x28,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0xD2,0xFF,0xFF,0xFF,0x30,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0xBC,0xFF,0xFF,0xFF,0x3F,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x9C,0xFF,0xFF,0xFF,0x65,   0,   0,   0,   0,   0,   0,0xA1,0xBB,0xBB,0xBB,0x16,
-   0,0x55,0xFF,0xFF,0xFF,0xAA,   0,   0,   0,   0,   0,0x0D,0xF9,0xFF,0xFF,0xF8,0x03,
-   0,0x0F,0xF4,0xFF,0xFF,0xFC,0x35,   0,   0,   0,   0,0x8D,0xFF,0xFF,0xFF,0xB0,   0,
-   0,   0,0x7C,0xFF,0xFF,0xFF,0xF1,0x84,0x54,0x65,0xB3,0xFF,0xFF,0xFF,0xFF,0x3E,   0,
-   0,   0,0x08,0xC7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x8F,   0,   0,
-   0,   0,   0,0x0C,0xBA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFD,0x84,0x02,   0,   0,
-   0,   0,   0,   0,0x01,0x52,0xB1,0xE6,0xFA,0xF1,0xD2,0x90,0x26,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x0C,0x6A,0xB4,0xE0,0xF6,0xF0,0xD4,0xA5,0x4A,0x04,   0,
+   0,   0,   0,   0,   0,0x51,0xE7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x50,   0,
+   0,   0,   0,   0,0x5F,0xFD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x50,   0,
+   0,   0,   0,0x26,0xF7,0xFF,0xFF,0xFF,0xDF,0x56,0x13,0x10,0x59,0xE1,0xFF,0x50,   0,
+   0,   0,   0,0xB1,0xFF,0xFF,0xFF,0xE4,0x17,   0,   0,   0,   0,0x19,0xD6,0x50,   0,
+   0,   0,0x1A,0xFC,0xFF,0xFF,0xFF,0x60,   0,   0,   0,   0,   0,   0,0x24,0x40,   0,
+   0,   0,0x62,0xFF,0xFF,0xFF,0xF7,0x09,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x95,0xFF,0xFF,0xFF,0xC1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xBA,0xFF,0xFF,0xFF,0x9C,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xC9,0xFF,0xFF,0xFF,0x8A,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xD4,0xFF,0xFF,0xFF,0x82,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xC9,0xFF,0xFF,0xFF,0x8A,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xBA,0xFF,0xFF,0xFF,0x9C,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x96,0xFF,0xFF,0xFF,0xC1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x62,0xFF,0xFF,0xFF,0xF7,0x09,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x1A,0xFC,0xFF,0xFF,0xFF,0x5F,   0,   0,   0,   0,   0,   0,0x24,0x40,   0,
+   0,   0,   0,0xB2,0xFF,0xFF,0xFF,0xE4,0x17,   0,   0,   0,   0,0x19,0xD5,0x50,   0,
+   0,   0,   0,0x28,0xF8,0xFF,0xFF,0xFF,0xDE,0x55,0x11,0x10,0x58,0xE1,0xFF,0x50,   0,
+   0,   0,   0,   0,0x62,0xFD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x50,   0,
+   0,   0,   0,   0,   0,0x54,0xE8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x50,   0,
+   0,   0,   0,   0,   0,   0,0x0C,0x6C,0xB6,0xE2,0xF7,0xF1,0xD5,0xA6,0x4B,0x04,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1485,32 +1291,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x3B,0xFF,0xFF,0xFF,0xFF,0xFF,0xF9,0xE3,0xB1,0x62,0x09,   0,   0,   0,   0,   0,
-   0,0x3B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE5,0x47,   0,   0,   0,   0,
-   0,0x3B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFC,0x6B,   0,   0,   0,
-   0,0x3B,0xFF,0xFF,0xFF,0xDA,0x53,0x61,0x8D,0xE7,0xFF,0xFF,0xFF,0xFD,0x42,   0,   0,
-   0,0x3B,0xFF,0xFF,0xFF,0xC7,   0,   0,   0,0x0F,0xC1,0xFF,0xFF,0xFF,0xE5,0x08,   0,
-   0,0x3B,0xFF,0xFF,0xFF,0xC7,   0,   0,   0,   0,0x10,0xEA,0xFF,0xFF,0xFF,0x63,   0,
-   0,0x3B,0xFF,0xFF,0xFF,0xC7,   0,   0,   0,   0,   0,0x74,0xFF,0xFF,0xFF,0xB7,   0,
-   0,0x3B,0xFF,0xFF,0xFF,0xC7,   0,   0,   0,   0,   0,0x2B,0xFF,0xFF,0xFF,0xEF,   0,
-   0,0x3B,0xFF,0xFF,0xFF,0xC7,   0,   0,   0,   0,   0,0x05,0xFF,0xFF,0xFF,0xFF,0x12,
-   0,0x3B,0xFF,0xFF,0xFF,0xC7,   0,   0,   0,   0,   0,   0,0xF0,0xFF,0xFF,0xFF,0x20,
-   0,0x3B,0xFF,0xFF,0xFF,0xC7,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x23,
-   0,0x3B,0xFF,0xFF,0xFF,0xC7,   0,   0,   0,   0,   0,   0,0xEF,0xFF,0xFF,0xFF,0x21,
-   0,0x3B,0xFF,0xFF,0xFF,0xC7,   0,   0,   0,   0,   0,0x04,0xFE,0xFF,0xFF,0xFF,0x13,
-   0,0x3B,0xFF,0xFF,0xFF,0xC7,   0,   0,   0,   0,   0,0x26,0xFF,0xFF,0xFF,0xF0,   0,
-   0,0x3B,0xFF,0xFF,0xFF,0xC7,   0,   0,   0,   0,   0,0x69,0xFF,0xFF,0xFF,0xB1,   0,
-   0,0x3B,0xFF,0xFF,0xFF,0xC7,   0,   0,   0,   0,0x06,0xDE,0xFF,0xFF,0xFF,0x52,   0,
-   0,0x3B,0xFF,0xFF,0xFF,0xC7,   0,   0,   0,0x03,0xA6,0xFF,0xFF,0xFF,0xE3,0x07,   0,
-   0,0x3B,0xFF,0xFF,0xFF,0xD7,0x47,0x50,0x76,0xD8,0xFF,0xFF,0xFF,0xFE,0x42,   0,   0,
-   0,0x3B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x78,   0,   0,   0,
-   0,0x3B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xED,0x5D,   0,   0,   0,   0,
-   0,0x3B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFC,0xEA,0xBC,0x6F,0x10,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0xFD,0xED,0xDC,0xB0,0x77,0x1D,   0,   0,   0,   0,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFB,0x9A,0x0A,   0,   0,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xCE,0x0C,   0,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,0x07,0x29,0x8A,0xFC,0xFF,0xFF,0xFF,0x9B,   0,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,0x6B,0xFF,0xFF,0xFF,0xFD,0x1F,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,0x02,0xDE,0xFF,0xFF,0xFF,0x80,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0x93,0xFF,0xFF,0xFF,0xBD,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0x64,0xFF,0xFF,0xFF,0xEE,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0x46,0xFF,0xFF,0xFF,0xFF,0x0B,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0x39,0xFF,0xFF,0xFF,0xFF,0x19,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0x32,0xFF,0xFF,0xFF,0xFF,0x24,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0x39,0xFF,0xFF,0xFF,0xFF,0x19,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0x46,0xFF,0xFF,0xFF,0xFF,0x0B,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0x64,0xFF,0xFF,0xFF,0xED,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0x95,0xFF,0xFF,0xFF,0xBC,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,0x02,0xDE,0xFF,0xFF,0xFF,0x7E,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,0x6A,0xFF,0xFF,0xFF,0xFD,0x1E,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,0x06,0x28,0x8A,0xFC,0xFF,0xFF,0xFF,0x97,   0,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xCB,0x0B,   0,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFA,0x9A,0x09,   0,   0,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0xFD,0xEF,0xDD,0xB2,0x77,0x1D,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1525,32 +1326,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEF,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEF,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEF,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x65,0x57,0x57,0x57,0x57,0x57,0x57,0x57,0x57,0x52,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x13,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x13,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x13,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x13,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x47,0x37,0x37,0x37,0x37,0x37,0x37,0x37,0x1E,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x8B,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x8B,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x8B,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x13,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x13,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x13,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x13,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x13,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x5A,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x49,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF7,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF7,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF7,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xA0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x8C,   0,
+   0,   0,0xA0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x8C,   0,
+   0,   0,0xA0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x8C,   0,
+   0,   0,0xA0,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xA0,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xA0,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xA0,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xA0,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xA0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB4,   0,   0,
+   0,   0,0xA0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB4,   0,   0,
+   0,   0,0xA0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB4,   0,   0,
+   0,   0,0xA0,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xA0,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xA0,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xA0,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xA0,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xA0,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xA0,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xA0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x8C,   0,
+   0,   0,0xA0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x8C,   0,
+   0,   0,0xA0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x8C,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1565,32 +1361,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x0B,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x0B,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x0B,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x6A,0x57,0x57,0x57,0x57,0x57,0x57,0x57,0x57,0x57,0x04,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x1B,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x1B,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x1B,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x1B,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x1B,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEF,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEF,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEF,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x63,0x4F,0x4F,0x4F,0x4F,0x4F,0x4F,0x4F,0x4A,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x1B,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x1B,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x1B,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x1B,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x1B,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x1B,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x1B,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x1B,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x6C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC0,   0,
+   0,   0,0x6C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC0,   0,
+   0,   0,0x6C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC0,   0,
+   0,   0,0x6C,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x6C,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x6C,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x6C,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x6C,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x6C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,   0,   0,
+   0,   0,0x6C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,   0,   0,
+   0,   0,0x6C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,   0,   0,
+   0,   0,0x6C,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x6C,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x6C,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x6C,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x6C,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x6C,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x6C,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x6C,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x6C,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x6C,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1605,32 +1396,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x3B,0xA3,0xE1,0xFA,0xF2,0xD8,0x9E,0x3F,   0,   0,   0,   0,
-   0,   0,   0,0x02,0x93,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xAB,0x0A,   0,   0,
-   0,   0,   0,0x9E,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xAD,   0,   0,
-   0,   0,0x52,0xFF,0xFF,0xFF,0xFF,0xAE,0x5B,0x64,0xA9,0xFF,0xFF,0xFF,0xFF,0x44,   0,
-   0,   0,0xDA,0xFF,0xFF,0xFF,0x92,   0,   0,   0,   0,0x7F,0xFF,0xFF,0xFF,0xA5,   0,
-   0,0x31,0xFF,0xFF,0xFF,0xEB,0x0A,   0,   0,   0,   0,0x0F,0xFD,0xFF,0xFF,0xE1,   0,
-   0,0x7F,0xFF,0xFF,0xFF,0x94,   0,   0,   0,   0,   0,   0,0x39,0x3F,0x3F,0x3F,   0,
-   0,0xA9,0xFF,0xFF,0xFF,0x5D,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0xBC,0xFF,0xFF,0xFF,0x46,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0xC3,0xFF,0xFF,0xFF,0x3C,   0,   0,0x02,0x07,0x07,0x07,0x07,0x07,0x07,0x07,   0,
-   0,0xC3,0xFF,0xFF,0xFF,0x3B,   0,   0,0x5B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x03,
-   0,0xC3,0xFF,0xFF,0xFF,0x3C,   0,   0,0x5B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x03,
-   0,0xBD,0xFF,0xFF,0xFF,0x45,   0,   0,0x5B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x04,
-   0,0xAC,0xFF,0xFF,0xFF,0x58,   0,   0,   0,   0,   0,   0,0xF5,0xFF,0xFF,0xFF,0x04,
-   0,0x88,0xFF,0xFF,0xFF,0x88,   0,   0,   0,   0,   0,   0,0xF6,0xFF,0xFF,0xFF,0x05,
-   0,0x49,0xFF,0xFF,0xFF,0xD5,   0,   0,   0,   0,   0,   0,0xF7,0xFF,0xFF,0xFF,0x05,
-   0,0x06,0xE6,0xFF,0xFF,0xFF,0x6A,   0,   0,   0,   0,0x03,0xF9,0xFF,0xFF,0xFF,0x06,
-   0,   0,0x63,0xFF,0xFF,0xFF,0xFF,0xA3,0x58,0x46,0x6F,0xCE,0xFF,0xFF,0xFF,0xFF,0x06,
-   0,   0,   0,0xB1,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC3,0x02,
-   0,   0,   0,0x06,0x9C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF4,0x7F,0x07,   0,
-   0,   0,   0,   0,   0,0x37,0xA0,0xD5,0xF3,0xF2,0xD9,0xB4,0x66,0x14,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x37,0x8F,0xD0,0xEB,0xFB,0xF0,0xCD,0x8D,0x3C,0x02,   0,
+   0,   0,   0,   0,0x0E,0xA8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x40,   0,
+   0,   0,   0,0x0F,0xCC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x40,   0,
+   0,   0,   0,0x9F,0xFF,0xFF,0xFF,0xFF,0x97,0x2D,0x08,0x1D,0x6A,0xE6,0xFF,0x40,   0,
+   0,   0,0x31,0xFF,0xFF,0xFF,0xFF,0x77,   0,   0,   0,   0,   0,0x1B,0xD5,0x40,   0,
+   0,   0,0x96,0xFF,0xFF,0xFF,0xD9,0x02,   0,   0,   0,   0,   0,   0,0x28,0x35,   0,
+   0,   0,0xE2,0xFF,0xFF,0xFF,0x7D,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x15,0xFF,0xFF,0xFF,0xFF,0x40,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x3A,0xFF,0xFF,0xFF,0xFF,0x1B,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x49,0xFF,0xFF,0xFF,0xFF,0x0A,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x54,0xFF,0xFF,0xFF,0xFF,0x02,   0,   0,0x84,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,   0,
+   0,0x49,0xFF,0xFF,0xFF,0xFF,0x0A,   0,   0,0x84,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,   0,
+   0,0x3A,0xFF,0xFF,0xFF,0xFF,0x1C,   0,   0,0x84,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,   0,
+   0,0x15,0xFF,0xFF,0xFF,0xFF,0x40,   0,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x7D,   0,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,   0,
+   0,   0,0x93,0xFF,0xFF,0xFF,0xD8,0x01,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,   0,
+   0,   0,0x2F,0xFF,0xFF,0xFF,0xFF,0x6F,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,   0,
+   0,   0,   0,0x9C,0xFF,0xFF,0xFF,0xFD,0x89,0x21,0x06,0x27,0xCE,0xFF,0xFF,0xFF,   0,
+   0,   0,   0,0x0E,0xCC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,   0,
+   0,   0,   0,   0,0x0F,0xAD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFD,0x9E,   0,
+   0,   0,   0,   0,   0,   0,0x3D,0x97,0xD7,0xF0,0xFA,0xEA,0xC2,0x82,0x25,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1645,32 +1431,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xAF,   0,   0,   0,   0,   0,0x77,0xFF,0xFF,0xFF,0x77,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xAF,   0,   0,   0,   0,   0,0x77,0xFF,0xFF,0xFF,0x77,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xAF,   0,   0,   0,   0,   0,0x77,0xFF,0xFF,0xFF,0x77,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xAF,   0,   0,   0,   0,   0,0x77,0xFF,0xFF,0xFF,0x77,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xAF,   0,   0,   0,   0,   0,0x77,0xFF,0xFF,0xFF,0x77,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xAF,   0,   0,   0,   0,   0,0x77,0xFF,0xFF,0xFF,0x77,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xAF,   0,   0,   0,   0,   0,0x77,0xFF,0xFF,0xFF,0x77,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xAF,   0,   0,   0,   0,   0,0x77,0xFF,0xFF,0xFF,0x77,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xC7,0x4B,0x4B,0x4B,0x4B,0x4B,0xA0,0xFF,0xFF,0xFF,0x77,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x77,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x77,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x77,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xAF,   0,   0,   0,   0,   0,0x77,0xFF,0xFF,0xFF,0x77,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xAF,   0,   0,   0,   0,   0,0x77,0xFF,0xFF,0xFF,0x77,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xAF,   0,   0,   0,   0,   0,0x77,0xFF,0xFF,0xFF,0x77,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xAF,   0,   0,   0,   0,   0,0x77,0xFF,0xFF,0xFF,0x77,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xAF,   0,   0,   0,   0,   0,0x77,0xFF,0xFF,0xFF,0x77,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xAF,   0,   0,   0,   0,   0,0x77,0xFF,0xFF,0xFF,0x77,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xAF,   0,   0,   0,   0,   0,0x77,0xFF,0xFF,0xFF,0x77,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xAF,   0,   0,   0,   0,   0,0x77,0xFF,0xFF,0xFF,0x77,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xAF,   0,   0,   0,   0,   0,0x77,0xFF,0xFF,0xFF,0x77,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0x20,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,0x84,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1685,32 +1466,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x43,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA7,   0,   0,
-   0,   0,0x43,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA7,   0,   0,
-   0,   0,0x43,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA7,   0,   0,
-   0,   0,0x15,0x4F,0x4F,0x4F,0x8C,0xFF,0xFF,0xFF,0xC0,0x4F,0x4F,0x4F,0x34,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,   0,   0,   0,
-   0,   0,0x13,0x47,0x47,0x47,0x87,0xFF,0xFF,0xFF,0xBD,0x47,0x47,0x47,0x2F,   0,   0,
-   0,   0,0x43,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA7,   0,   0,
-   0,   0,0x43,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA7,   0,   0,
-   0,   0,0x43,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA7,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x08,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1725,32 +1501,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x6B,0xFF,0xFF,0xFF,0x8F,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x6B,0xFF,0xFF,0xFF,0x8F,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x6B,0xFF,0xFF,0xFF,0x8F,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x6B,0xFF,0xFF,0xFF,0x90,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x6B,0xFF,0xFF,0xFF,0x90,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x6B,0xFF,0xFF,0xFF,0x90,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x6B,0xFF,0xFF,0xFF,0x90,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x6B,0xFF,0xFF,0xFF,0x91,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x6B,0xFF,0xFF,0xFF,0x91,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x6B,0xFF,0xFF,0xFF,0x91,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x6B,0xFF,0xFF,0xFF,0x92,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x6B,0xFF,0xFF,0xFF,0x92,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x6B,0xFF,0xFF,0xFF,0x92,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x6B,0xFF,0xFF,0xFF,0x92,   0,
-   0,0x2A,0x67,0x67,0x67,0x3C,   0,   0,   0,   0,   0,0x75,0xFF,0xFF,0xFF,0x8E,   0,
-   0,0x57,0xFF,0xFF,0xFF,0xA9,   0,   0,   0,   0,   0,0xA1,0xFF,0xFF,0xFF,0x73,   0,
-   0,0x2B,0xFF,0xFF,0xFF,0xEE,0x0F,   0,   0,   0,0x26,0xF8,0xFF,0xFF,0xFF,0x30,   0,
-   0,   0,0xD4,0xFF,0xFF,0xFF,0xD9,0x68,0x48,0x6F,0xEE,0xFF,0xFF,0xFF,0xC1,   0,   0,
-   0,   0,0x43,0xFC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEE,0x27,   0,   0,
-   0,   0,   0,0x57,0xF3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xDD,0x31,   0,   0,   0,
-   0,   0,   0,   0,0x1B,0x83,0xC8,0xEF,0xFB,0xEB,0xBB,0x68,0x07,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x04,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x48,   0,   0,
+   0,   0,   0,   0,0x04,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x48,   0,   0,
+   0,   0,   0,   0,0x04,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x48,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xE8,0xFF,0xFF,0xFF,0x48,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xE8,0xFF,0xFF,0xFF,0x48,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xE8,0xFF,0xFF,0xFF,0x48,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xE8,0xFF,0xFF,0xFF,0x48,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xE8,0xFF,0xFF,0xFF,0x48,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xE8,0xFF,0xFF,0xFF,0x48,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xE8,0xFF,0xFF,0xFF,0x48,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xE8,0xFF,0xFF,0xFF,0x48,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xE8,0xFF,0xFF,0xFF,0x48,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xE8,0xFF,0xFF,0xFF,0x48,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xE8,0xFF,0xFF,0xFF,0x48,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xED,0xFF,0xFF,0xFF,0x41,   0,   0,
+   0,0x58,0x23,   0,   0,   0,   0,   0,   0,0x0B,0xFE,0xFF,0xFF,0xFF,0x31,   0,   0,
+   0,0x74,0xE3,0x3A,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xFD,0x0B,   0,   0,
+   0,0x74,0xFF,0xFC,0x9E,0x3B,0x0E,0x18,0x60,0xF0,0xFF,0xFF,0xFF,0xC5,   0,   0,   0,
+   0,0x74,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x4F,   0,   0,   0,
+   0,0x74,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFD,0x7D,   0,   0,   0,   0,
+   0,0x06,0x3E,0x7F,0xBB,0xD7,0xEE,0xFB,0xEF,0xCE,0x94,0x30,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1765,32 +1536,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-0x2B,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,   0,   0,   0,0xA6,0xFF,0xFF,0xFF,0xFB,0x39,
-0x2B,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,   0,   0,0x59,0xFF,0xFF,0xFF,0xFF,0x78,   0,
-0x2B,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,   0,0x1D,0xEF,0xFF,0xFF,0xFF,0xB9,0x01,   0,
-0x2B,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,0x02,0xBF,0xFF,0xFF,0xFF,0xE7,0x17,   0,   0,
-0x2B,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,0x75,0xFF,0xFF,0xFF,0xFD,0x44,   0,   0,   0,
-0x2B,0xFF,0xFF,0xFF,0xCF,   0,   0,0x2F,0xF9,0xFF,0xFF,0xFF,0x84,   0,   0,   0,   0,
-0x2B,0xFF,0xFF,0xFF,0xCF,   0,0x08,0xD4,0xFF,0xFF,0xFF,0xC4,0x04,   0,   0,   0,   0,
-0x2B,0xFF,0xFF,0xFF,0xCF,   0,0x92,0xFF,0xFF,0xFF,0xEE,0x1E,   0,   0,   0,   0,   0,
-0x2B,0xFF,0xFF,0xFF,0xCF,0x4C,0xFF,0xFF,0xFF,0xFF,0x4F,   0,   0,   0,   0,   0,   0,
-0x2B,0xFF,0xFF,0xFF,0xE2,0xEB,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,   0,   0,   0,   0,
-0x2B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x50,   0,   0,   0,   0,   0,   0,
-0x2B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE3,0x0C,   0,   0,   0,   0,   0,
-0x2B,0xFF,0xFF,0xFF,0xFF,0xFF,0xE1,0xEB,0xFF,0xFF,0xFF,0x8E,   0,   0,   0,   0,   0,
-0x2B,0xFF,0xFF,0xFF,0xFF,0xEA,0x27,0x64,0xFF,0xFF,0xFF,0xFC,0x31,   0,   0,   0,   0,
-0x2B,0xFF,0xFF,0xFF,0xF5,0x34,   0,0x01,0xC9,0xFF,0xFF,0xFF,0xC9,0x02,   0,   0,   0,
-0x2B,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,0x34,0xFD,0xFF,0xFF,0xFF,0x6A,   0,   0,   0,
-0x2B,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,   0,0x99,0xFF,0xFF,0xFF,0xF0,0x18,   0,   0,
-0x2B,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,   0,0x13,0xEC,0xFF,0xFF,0xFF,0xA7,   0,   0,
-0x2B,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,   0,   0,0x67,0xFF,0xFF,0xFF,0xFF,0x46,   0,
-0x2B,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,   0,   0,0x02,0xCB,0xFF,0xFF,0xFF,0xDC,0x08,
-0x2B,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,   0,   0,   0,0x36,0xFE,0xFF,0xFF,0xFF,0x84,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+0x58,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,   0,   0,0x1C,0xE9,0xFF,0xFF,0xFF,0xB2,0x01,
+0x58,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,   0,0x06,0xC8,0xFF,0xFF,0xFF,0xD7,0x0E,   0,
+0x58,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,   0,0x9A,0xFF,0xFF,0xFF,0xF0,0x26,   0,   0,
+0x58,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,0x63,0xFF,0xFF,0xFF,0xFD,0x4B,   0,   0,   0,
+0x58,0xFF,0xFF,0xFF,0xD4,   0,   0,0x35,0xF8,0xFF,0xFF,0xFF,0x79,   0,   0,   0,   0,
+0x58,0xFF,0xFF,0xFF,0xD4,   0,0x15,0xE2,0xFF,0xFF,0xFF,0xAA,   0,   0,   0,   0,   0,
+0x58,0xFF,0xFF,0xFF,0xD4,0x03,0xBD,0xFF,0xFF,0xFF,0xD1,0x0B,   0,   0,   0,   0,   0,
+0x58,0xFF,0xFF,0xFF,0xD4,0x8C,0xFF,0xFF,0xFF,0xEC,0x21,   0,   0,   0,   0,   0,   0,
+0x58,0xFF,0xFF,0xFF,0xF7,0xFF,0xFF,0xFF,0xFF,0x9C,   0,   0,   0,   0,   0,   0,   0,
+0x58,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF9,0x21,   0,   0,   0,   0,   0,   0,
+0x58,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA5,   0,   0,   0,   0,   0,   0,
+0x58,0xFF,0xFF,0xFF,0xFF,0xFF,0xDD,0xFF,0xFF,0xFF,0xFE,0x32,   0,   0,   0,   0,   0,
+0x58,0xFF,0xFF,0xFF,0xFF,0xDC,0x12,0xCD,0xFF,0xFF,0xFF,0xBB,   0,   0,   0,   0,   0,
+0x58,0xFF,0xFF,0xFF,0xF5,0x2C,   0,0x47,0xFF,0xFF,0xFF,0xFF,0x46,   0,   0,   0,   0,
+0x58,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,0xBF,0xFF,0xFF,0xFF,0xCF,0x01,   0,   0,   0,
+0x58,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,0x37,0xFF,0xFF,0xFF,0xFF,0x5B,   0,   0,   0,
+0x58,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,   0,0xB0,0xFF,0xFF,0xFF,0xDF,0x07,   0,   0,
+0x58,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,   0,0x2A,0xFD,0xFF,0xFF,0xFF,0x71,   0,   0,
+0x58,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,   0,   0,0xA0,0xFF,0xFF,0xFF,0xEC,0x0F,   0,
+0x58,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,   0,   0,0x1F,0xF8,0xFF,0xFF,0xFF,0x87,   0,
+0x58,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,   0,   0,   0,0x90,0xFF,0xFF,0xFF,0xF6,0x1B,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1805,32 +1571,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x1F,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x1F,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x1F,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x1F,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x1F,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x1F,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x1F,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x1F,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x1F,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x1F,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x1F,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x1F,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x1F,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x1F,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x1F,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x1F,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x1F,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x62,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x3B,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC7,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC7,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC7,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x4C,
+   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x4C,
+   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x4C,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1845,32 +1606,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x33,0xFF,0xFF,0xFF,0xFF,0xDA,   0,   0,   0,0x38,0xFF,0xFF,0xFF,0xFF,0xDB,   0,
-   0,0x33,0xFF,0xFF,0xFF,0xFF,0xFF,0x1A,   0,   0,0x80,0xFF,0xFF,0xFF,0xFF,0xDB,   0,
-   0,0x33,0xFF,0xFF,0xFF,0xFF,0xFF,0x58,   0,   0,0xC8,0xFF,0xFF,0xFF,0xFF,0xDB,   0,
-   0,0x33,0xFF,0xFF,0xFF,0xFF,0xFF,0x97,   0,0x13,0xFD,0xFF,0xFF,0xFF,0xFF,0xDB,   0,
-   0,0x33,0xFF,0xFF,0xFF,0xFF,0xFF,0xD6,   0,0x58,0xFF,0xFF,0xFF,0xFF,0xFF,0xDB,   0,
-   0,0x33,0xFF,0xFF,0xFF,0xF5,0xFF,0xFF,0x16,0xA0,0xFF,0xFF,0xDE,0xFF,0xFF,0xDB,   0,
-   0,0x33,0xFF,0xFF,0xFF,0xB8,0xFF,0xFF,0x55,0xE7,0xFF,0xEC,0xAA,0xFF,0xFF,0xDB,   0,
-   0,0x33,0xFF,0xFF,0xFF,0x75,0xFF,0xFF,0xC4,0xFF,0xFF,0xA2,0xAB,0xFF,0xFF,0xDB,   0,
-   0,0x33,0xFF,0xFF,0xFF,0x56,0xDC,0xFF,0xFF,0xFF,0xFF,0x55,0xAF,0xFF,0xFF,0xDB,   0,
-   0,0x33,0xFF,0xFF,0xFF,0x5A,0x94,0xFF,0xFF,0xFF,0xFA,0x0F,0xB4,0xFF,0xFF,0xDB,   0,
-   0,0x33,0xFF,0xFF,0xFF,0x5F,0x4C,0xFF,0xFF,0xFF,0xBC,   0,0xB8,0xFF,0xFF,0xDB,   0,
-   0,0x33,0xFF,0xFF,0xFF,0x63,0x0B,0xF9,0xFF,0xFF,0x70,   0,0xBD,0xFF,0xFF,0xDB,   0,
-   0,0x33,0xFF,0xFF,0xFF,0x68,   0,0xBD,0xFF,0xFF,0x24,   0,0xC1,0xFF,0xFF,0xDB,   0,
-   0,0x33,0xFF,0xFF,0xFF,0x6D,   0,0x75,0xFF,0xD7,   0,   0,0xC6,0xFF,0xFF,0xDB,   0,
-   0,0x33,0xFF,0xFF,0xFF,0x72,   0,0x06,0x13,0x0D,   0,   0,0xCA,0xFF,0xFF,0xDB,   0,
-   0,0x33,0xFF,0xFF,0xFF,0x73,   0,   0,   0,   0,   0,   0,0xCB,0xFF,0xFF,0xDB,   0,
-   0,0x33,0xFF,0xFF,0xFF,0x73,   0,   0,   0,   0,   0,   0,0xCB,0xFF,0xFF,0xDB,   0,
-   0,0x33,0xFF,0xFF,0xFF,0x73,   0,   0,   0,   0,   0,   0,0xCB,0xFF,0xFF,0xDB,   0,
-   0,0x33,0xFF,0xFF,0xFF,0x73,   0,   0,   0,   0,   0,   0,0xCB,0xFF,0xFF,0xDB,   0,
-   0,0x33,0xFF,0xFF,0xFF,0x73,   0,   0,   0,   0,   0,   0,0xCB,0xFF,0xFF,0xDB,   0,
-   0,0x33,0xFF,0xFF,0xFF,0x73,   0,   0,   0,   0,   0,   0,0xCB,0xFF,0xFF,0xDB,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0xC8,0xFF,0xFF,0xFF,0xFF,0x57,   0,   0,   0,   0,0xE7,0xFF,0xFF,0xFF,0xFF,0x3C,
+   0,0xC8,0xFF,0xFF,0xFF,0xFF,0x9F,   0,   0,   0,0x30,0xFF,0xFF,0xFF,0xFF,0xFF,0x3C,
+   0,0xC8,0xFF,0xFF,0xFF,0xFF,0xE6,   0,   0,   0,0x78,0xFF,0xFF,0xFF,0xFF,0xFF,0x3C,
+   0,0xC8,0xFF,0xFF,0xFF,0xFF,0xFF,0x2F,   0,   0,0xC0,0xFF,0xFF,0xFF,0xFF,0xFF,0x3C,
+   0,0xC8,0xFF,0xFF,0xE4,0xFE,0xFF,0x77,   0,0x0D,0xFA,0xFF,0xE3,0xFF,0xFF,0xFF,0x3C,
+   0,0xC8,0xFF,0xFF,0xD0,0xD3,0xFF,0xBE,   0,0x4F,0xFF,0xFF,0xA3,0xFF,0xFF,0xFF,0x3C,
+   0,0xC8,0xFF,0xFF,0xD0,0x92,0xFF,0xF9,0x0C,0x97,0xFF,0xFB,0x68,0xFF,0xFF,0xFF,0x3C,
+   0,0xC8,0xFF,0xFF,0xD0,0x51,0xFF,0xFF,0x4E,0xDE,0xFF,0xC7,0x5C,0xFF,0xFF,0xFF,0x3C,
+   0,0xC8,0xFF,0xFF,0xD0,0x12,0xFE,0xFF,0xBC,0xFF,0xFF,0x87,0x5C,0xFF,0xFF,0xFF,0x3C,
+   0,0xC8,0xFF,0xFF,0xD0,   0,0xCF,0xFF,0xFF,0xFF,0xFF,0x47,0x5C,0xFF,0xFF,0xFF,0x3C,
+   0,0xC8,0xFF,0xFF,0xD0,   0,0x8E,0xFF,0xFF,0xFF,0xFB,0x0C,0x5C,0xFF,0xFF,0xFF,0x3C,
+   0,0xC8,0xFF,0xFF,0xD0,   0,0x4D,0xFF,0xFF,0xFF,0xC7,   0,0x5C,0xFF,0xFF,0xFF,0x3C,
+   0,0xC8,0xFF,0xFF,0xD0,   0,0x0F,0xFC,0xFF,0xFF,0x87,   0,0x5C,0xFF,0xFF,0xFF,0x3C,
+   0,0xC8,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0x3C,
+   0,0xC8,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0x3C,
+   0,0xC8,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0x3C,
+   0,0xC8,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0x3C,
+   0,0xC8,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0x3C,
+   0,0xC8,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0x3C,
+   0,0xC8,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0x3C,
+   0,0xC8,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0x3C,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1885,32 +1641,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xEC,0x08,   0,   0,   0,   0,0x8C,0xFF,0xFF,0xFF,0x73,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xFF,0x60,   0,   0,   0,   0,0x8C,0xFF,0xFF,0xFF,0x73,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xFF,0xCB,   0,   0,   0,   0,0x8C,0xFF,0xFF,0xFF,0x73,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xFF,0xFF,0x36,   0,   0,   0,0x8D,0xFF,0xFF,0xFF,0x73,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xFF,0xFF,0xA1,   0,   0,   0,0x8D,0xFF,0xFF,0xFF,0x73,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xFF,0xFF,0xF8,0x14,   0,   0,0x8D,0xFF,0xFF,0xFF,0x73,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x78,   0,   0,0x8E,0xFF,0xFF,0xFF,0x73,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xF7,0xFF,0xFF,0xE0,0x02,   0,0x8E,0xFF,0xFF,0xFF,0x73,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xC1,0xDB,0xFF,0xFF,0x4E,   0,0x8E,0xFF,0xFF,0xFF,0x73,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xBF,0x6F,0xFF,0xFF,0xBA,   0,0x8E,0xFF,0xFF,0xFF,0x73,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xBF,0x0E,0xF3,0xFF,0xFE,0x26,0x8F,0xFF,0xFF,0xFF,0x73,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xBF,   0,0x94,0xFF,0xFF,0x90,0x8F,0xFF,0xFF,0xFF,0x73,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xBF,   0,0x28,0xFE,0xFF,0xF0,0x9B,0xFF,0xFF,0xFF,0x73,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xBF,   0,   0,0xB9,0xFF,0xFF,0xEE,0xFF,0xFF,0xFF,0x73,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xBF,   0,   0,0x4C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x73,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xBF,   0,   0,0x02,0xDC,0xFF,0xFF,0xFF,0xFF,0xFF,0x73,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,0x71,0xFF,0xFF,0xFF,0xFF,0xFF,0x73,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,0x0F,0xF4,0xFF,0xFF,0xFF,0xFF,0x73,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,   0,0x96,0xFF,0xFF,0xFF,0xFF,0x73,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,   0,0x29,0xFF,0xFF,0xFF,0xFF,0x73,   0,
-   0,0x43,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,   0,   0,0xBA,0xFF,0xFF,0xFF,0x73,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x50,0xFF,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,   0,0xF0,0xFF,0xFF,0xC0,   0,
+   0,0x50,0xFF,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,   0,   0,0xF0,0xFF,0xFF,0xC0,   0,
+   0,0x50,0xFF,0xFF,0xFF,0xFF,0xFE,0x23,   0,   0,   0,   0,0xF0,0xFF,0xFF,0xC0,   0,
+   0,0x50,0xFF,0xFF,0xFF,0xFF,0xFF,0x85,   0,   0,   0,   0,0xF0,0xFF,0xFF,0xC0,   0,
+   0,0x50,0xFF,0xFF,0xFF,0xFF,0xFF,0xE5,0x03,   0,   0,   0,0xF0,0xFF,0xFF,0xC0,   0,
+   0,0x50,0xFF,0xFF,0xFF,0xFC,0xFF,0xFF,0x4A,   0,   0,   0,0xF0,0xFF,0xFF,0xC0,   0,
+   0,0x50,0xFF,0xFF,0xFF,0xB4,0xFF,0xFF,0xAD,   0,   0,   0,0xF0,0xFF,0xFF,0xC0,   0,
+   0,0x50,0xFF,0xFF,0xFF,0x63,0xED,0xFF,0xFA,0x16,   0,   0,0xF0,0xFF,0xFF,0xC0,   0,
+   0,0x50,0xFF,0xFF,0xFF,0x5C,0x92,0xFF,0xFF,0x73,   0,   0,0xF0,0xFF,0xFF,0xC0,   0,
+   0,0x50,0xFF,0xFF,0xFF,0x5C,0x2E,0xFF,0xFF,0xD6,   0,   0,0xF0,0xFF,0xFF,0xC0,   0,
+   0,0x50,0xFF,0xFF,0xFF,0x5C,   0,0xCB,0xFF,0xFF,0x38,   0,0xF0,0xFF,0xFF,0xC0,   0,
+   0,0x50,0xFF,0xFF,0xFF,0x5C,   0,0x68,0xFF,0xFF,0x9B,   0,0xF0,0xFF,0xFF,0xC0,   0,
+   0,0x50,0xFF,0xFF,0xFF,0x5C,   0,0x0E,0xF5,0xFF,0xF2,0x0B,0xF0,0xFF,0xFF,0xC0,   0,
+   0,0x50,0xFF,0xFF,0xFF,0x5C,   0,   0,0xA1,0xFF,0xFF,0x61,0xF0,0xFF,0xFF,0xC0,   0,
+   0,0x50,0xFF,0xFF,0xFF,0x5C,   0,   0,0x3E,0xFF,0xFF,0xC3,0xF0,0xFF,0xFF,0xC0,   0,
+   0,0x50,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,0xD9,0xFF,0xFF,0xFD,0xFF,0xFF,0xC0,   0,
+   0,0x50,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,0x77,0xFF,0xFF,0xFF,0xFF,0xFF,0xC0,   0,
+   0,0x50,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,0x18,0xFB,0xFF,0xFF,0xFF,0xFF,0xC0,   0,
+   0,0x50,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,0xB0,0xFF,0xFF,0xFF,0xFF,0xC0,   0,
+   0,0x50,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,0x4D,0xFF,0xFF,0xFF,0xFF,0xC0,   0,
+   0,0x50,0xFF,0xFF,0xFF,0x5C,   0,   0,   0,   0,0x03,0xE5,0xFF,0xFF,0xFF,0xC0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1925,32 +1676,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x49,0xB5,0xEA,0xFB,0xEE,0xBF,0x6C,0x09,   0,   0,   0,   0,
-   0,   0,   0,0x0E,0xBE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xDE,0x29,   0,   0,   0,
-   0,   0,0x07,0xCC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEE,0x2C,   0,   0,
-   0,   0,0x80,0xFF,0xFF,0xFF,0xF8,0x99,0x6D,0x8E,0xED,0xFF,0xFF,0xFF,0xCB,0x03,   0,
-   0,0x0E,0xF8,0xFF,0xFF,0xFE,0x4D,   0,   0,   0,0x24,0xEC,0xFF,0xFF,0xFF,0x56,   0,
-   0,0x58,0xFF,0xFF,0xFF,0xB9,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0xFF,0xAA,   0,
-   0,0x9E,0xFF,0xFF,0xFF,0x68,   0,   0,   0,   0,   0,0x16,0xFF,0xFF,0xFF,0xF4,0x02,
-   0,0xBA,0xFF,0xFF,0xFF,0x41,   0,   0,   0,   0,   0,   0,0xE7,0xFF,0xFF,0xFF,0x22,
-   0,0xD0,0xFF,0xFF,0xFF,0x31,   0,   0,   0,   0,   0,   0,0xD3,0xFF,0xFF,0xFF,0x34,
-   0,0xDB,0xFF,0xFF,0xFF,0x2B,   0,   0,   0,   0,   0,   0,0xCC,0xFF,0xFF,0xFF,0x3B,
-   0,0xDB,0xFF,0xFF,0xFF,0x2B,   0,   0,   0,   0,   0,   0,0xCB,0xFF,0xFF,0xFF,0x3B,
-   0,0xDB,0xFF,0xFF,0xFF,0x2B,   0,   0,   0,   0,   0,   0,0xCB,0xFF,0xFF,0xFF,0x3B,
-   0,0xD1,0xFF,0xFF,0xFF,0x2F,   0,   0,   0,   0,   0,   0,0xD3,0xFF,0xFF,0xFF,0x2F,
-   0,0xBB,0xFF,0xFF,0xFF,0x3D,   0,   0,   0,   0,   0,   0,0xE5,0xFF,0xFF,0xFF,0x17,
-   0,0x9D,0xFF,0xFF,0xFF,0x66,   0,   0,   0,   0,   0,0x14,0xFF,0xFF,0xFF,0xF6,0x03,
-   0,0x59,0xFF,0xFF,0xFF,0xB1,   0,   0,   0,   0,   0,0x6B,0xFF,0xFF,0xFF,0xB0,   0,
-   0,0x12,0xF5,0xFF,0xFF,0xFC,0x3C,   0,   0,   0,0x1B,0xE6,0xFF,0xFF,0xFF,0x5C,   0,
-   0,   0,0x7E,0xFF,0xFF,0xFF,0xF3,0x86,0x59,0x77,0xE5,0xFF,0xFF,0xFF,0xC9,0x02,   0,
-   0,   0,0x09,0xCC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF2,0x2B,   0,   0,
-   0,   0,   0,0x0F,0xC3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE4,0x38,   0,   0,   0,
-   0,   0,   0,   0,0x01,0x4A,0xB4,0xEA,0xFC,0xF0,0xC3,0x65,0x0A,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x4B,0xAA,0xE1,0xF8,0xEC,0xCA,0x7B,0x12,   0,   0,   0,   0,
+   0,   0,   0,0x07,0xAD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE8,0x3F,   0,   0,   0,
+   0,   0,   0,0xAA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF1,0x2C,   0,   0,
+   0,   0,0x4B,0xFF,0xFF,0xFF,0xFB,0x65,0x0C,0x2A,0xC7,0xFF,0xFF,0xFF,0xBE,   0,   0,
+   0,   0,0xC3,0xFF,0xFF,0xFF,0x8C,   0,   0,   0,0x1C,0xF8,0xFF,0xFF,0xFF,0x36,   0,
+   0,0x18,0xFD,0xFF,0xFF,0xFF,0x2A,   0,   0,   0,   0,0xB3,0xFF,0xFF,0xFF,0x8A,   0,
+   0,0x54,0xFF,0xFF,0xFF,0xF0,   0,   0,   0,   0,   0,0x7A,0xFF,0xFF,0xFF,0xC7,   0,
+   0,0x7E,0xFF,0xFF,0xFF,0xCD,   0,   0,   0,   0,   0,0x56,0xFF,0xFF,0xFF,0xF1,   0,
+   0,0x9B,0xFF,0xFF,0xFF,0xB7,   0,   0,   0,   0,   0,0x40,0xFF,0xFF,0xFF,0xFF,0x0F,
+   0,0xA8,0xFF,0xFF,0xFF,0xAD,   0,   0,   0,   0,   0,0x37,0xFF,0xFF,0xFF,0xFF,0x1B,
+   0,0xB1,0xFF,0xFF,0xFF,0xA9,   0,   0,   0,   0,   0,0x32,0xFF,0xFF,0xFF,0xFF,0x24,
+   0,0xA8,0xFF,0xFF,0xFF,0xAD,   0,   0,   0,   0,   0,0x37,0xFF,0xFF,0xFF,0xFF,0x1B,
+   0,0x9B,0xFF,0xFF,0xFF,0xB7,   0,   0,   0,   0,   0,0x40,0xFF,0xFF,0xFF,0xFF,0x0F,
+   0,0x7E,0xFF,0xFF,0xFF,0xCD,   0,   0,   0,   0,   0,0x56,0xFF,0xFF,0xFF,0xF1,   0,
+   0,0x54,0xFF,0xFF,0xFF,0xF0,   0,   0,   0,   0,   0,0x7A,0xFF,0xFF,0xFF,0xC7,   0,
+   0,0x19,0xFD,0xFF,0xFF,0xFF,0x28,   0,   0,   0,   0,0xB2,0xFF,0xFF,0xFF,0x8A,   0,
+   0,   0,0xC3,0xFF,0xFF,0xFF,0x8A,   0,   0,   0,0x1B,0xF7,0xFF,0xFF,0xFF,0x37,   0,
+   0,   0,0x4C,0xFF,0xFF,0xFF,0xFA,0x64,0x0B,0x28,0xC6,0xFF,0xFF,0xFF,0xBF,   0,   0,
+   0,   0,   0,0xAA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF2,0x2C,   0,   0,
+   0,   0,   0,0x08,0xAD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE8,0x40,   0,   0,   0,
+   0,   0,   0,   0,   0,0x4C,0xAC,0xE3,0xF9,0xED,0xCB,0x7C,0x12,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1965,32 +1711,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF8,0xE3,0xAE,0x5A,0x04,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD5,0x2C,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEC,0x24,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x64,0x53,0x53,0x5C,0x98,0xFC,0xFF,0xFF,0xFF,0xB7,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x17,   0,   0,   0,   0,0x48,0xFF,0xFF,0xFF,0xFF,0x24,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x17,   0,   0,   0,   0,   0,0xBD,0xFF,0xFF,0xFF,0x64,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x17,   0,   0,   0,   0,   0,0x8D,0xFF,0xFF,0xFF,0x7C,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x17,   0,   0,   0,   0,   0,0x9E,0xFF,0xFF,0xFF,0x71,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x17,   0,   0,   0,   0,0x11,0xEB,0xFF,0xFF,0xFF,0x45,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x17,   0,   0,0x0F,0x43,0xCF,0xFF,0xFF,0xFF,0xE5,0x05,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x56,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFB,0x6F,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF8,0xAF,0x32,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x60,0x4F,0x4F,0x49,0x34,0x08,   0,   0,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x17,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x17,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x17,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x17,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x17,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x17,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x17,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFA,0xED,0xD4,0xA9,0x5F,0x0C,   0,   0,   0,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE6,0x47,   0,   0,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF7,0x30,   0,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0x78,   0,0x04,0x1E,0x71,0xF7,0xFF,0xFF,0xFF,0xB3,   0,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,0x7B,0xFF,0xFF,0xFF,0xF8,0x09,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,0x32,0xFF,0xFF,0xFF,0xFF,0x28,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,0x20,0xFF,0xFF,0xFF,0xFF,0x37,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,0x32,0xFF,0xFF,0xFF,0xFF,0x28,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,0x7B,0xFF,0xFF,0xFF,0xF8,0x09,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0x78,   0,0x04,0x1D,0x70,0xF7,0xFF,0xFF,0xFF,0xB4,   0,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF8,0x31,   0,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE7,0x47,   0,   0,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFA,0xEF,0xD5,0xA9,0x61,0x0D,   0,   0,   0,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2005,36 +1746,31 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x4C,0xAD,0xE5,0xFA,0xF0,0xC5,0x76,0x0F,   0,   0,   0,   0,   0,
-   0,   0,0x0F,0xB3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEA,0x42,   0,   0,   0,   0,
-   0,0x05,0xC3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF8,0x3D,   0,   0,   0,
-   0,0x68,0xFF,0xFF,0xFF,0xFD,0xA4,0x6F,0x88,0xE6,0xFF,0xFF,0xFF,0xE3,0x0E,   0,   0,
-0x07,0xE4,0xFF,0xFF,0xFF,0x55,   0,   0,   0,0x10,0xDA,0xFF,0xFF,0xFF,0x78,   0,   0,
-0x46,0xFF,0xFF,0xFF,0xC9,   0,   0,   0,   0,   0,0x50,0xFF,0xFF,0xFF,0xD6,   0,   0,
-0x88,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,   0,   0,0x03,0xF4,0xFF,0xFF,0xFF,0x18,   0,
-0xAD,0xFF,0xFF,0xFF,0x53,   0,   0,   0,   0,   0,   0,0xC9,0xFF,0xFF,0xFF,0x40,   0,
-0xC0,0xFF,0xFF,0xFF,0x41,   0,   0,   0,   0,   0,   0,0xB5,0xFF,0xFF,0xFF,0x54,   0,
-0xCB,0xFF,0xFF,0xFF,0x3B,   0,   0,   0,   0,   0,   0,0xAC,0xFF,0xFF,0xFF,0x5F,   0,
-0xCB,0xFF,0xFF,0xFF,0x3B,   0,   0,   0,   0,   0,   0,0xAB,0xFF,0xFF,0xFF,0x5F,   0,
-0xCB,0xFF,0xFF,0xFF,0x3B,   0,   0,   0,   0,   0,   0,0xAB,0xFF,0xFF,0xFF,0x5F,   0,
-0xCA,0xFF,0xFF,0xFF,0x3C,   0,   0,   0,   0,   0,   0,0xAD,0xFF,0xFF,0xFF,0x5D,   0,
-0xB6,0xFF,0xFF,0xFF,0x47,   0,   0,   0,   0,   0,   0,0xBD,0xFF,0xFF,0xFF,0x44,   0,
-0x9A,0xFF,0xFF,0xFF,0x6E,   0,   0,   0,   0,   0,   0,0xE7,0xFF,0xFF,0xFF,0x24,   0,
-0x58,0xFF,0xFF,0xFF,0xBD,   0,   0,   0,   0,   0,0x42,0xFF,0xFF,0xFF,0xDD,   0,   0,
-0x0F,0xF1,0xFF,0xFF,0xFE,0x51,   0,   0,   0,0x0D,0xD2,0xFF,0xFF,0xFF,0x85,   0,   0,
-   0,0x75,0xFF,0xFF,0xFF,0xF8,0x8E,0x5A,0x73,0xDA,0xFF,0xFF,0xFF,0xEA,0x10,   0,   0,
-   0,0x06,0xBC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFA,0x3F,   0,   0,   0,
-   0,   0,0x08,0xB1,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFD,0x68,   0,   0,   0,
-   0,   0,   0,   0,0x4C,0xAF,0xE7,0xFB,0xF2,0xD5,0xFF,0xFF,0xFF,0xFF,0x7A,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x76,0xFF,0xFF,0xFF,0xFF,0x8D,0x01,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x68,0xFD,0xFF,0xFF,0xC2,0x0B,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x5B,0xFB,0xB0,0x08,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x35,0x03,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x4B,0xAA,0xE1,0xF8,0xEC,0xCA,0x7A,0x11,   0,   0,   0,   0,
+   0,   0,   0,0x07,0xAD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE6,0x3C,   0,   0,   0,
+   0,   0,   0,0xAA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEF,0x28,   0,   0,
+   0,   0,0x4B,0xFF,0xFF,0xFF,0xFB,0x65,0x0C,0x2A,0xC7,0xFF,0xFF,0xFF,0xB9,   0,   0,
+   0,   0,0xC3,0xFF,0xFF,0xFF,0x8C,   0,   0,   0,0x1C,0xF8,0xFF,0xFF,0xFF,0x32,   0,
+   0,0x18,0xFD,0xFF,0xFF,0xFF,0x2A,   0,   0,   0,   0,0xB3,0xFF,0xFF,0xFF,0x86,   0,
+   0,0x54,0xFF,0xFF,0xFF,0xF0,   0,   0,   0,   0,   0,0x7A,0xFF,0xFF,0xFF,0xC4,   0,
+   0,0x7E,0xFF,0xFF,0xFF,0xCD,   0,   0,   0,   0,   0,0x56,0xFF,0xFF,0xFF,0xEE,   0,
+   0,0x9B,0xFF,0xFF,0xFF,0xB7,   0,   0,   0,   0,   0,0x40,0xFF,0xFF,0xFF,0xFF,0x0D,
+   0,0xA8,0xFF,0xFF,0xFF,0xAD,   0,   0,   0,   0,   0,0x37,0xFF,0xFF,0xFF,0xFF,0x1A,
+   0,0xB1,0xFF,0xFF,0xFF,0xA9,   0,   0,   0,   0,   0,0x32,0xFF,0xFF,0xFF,0xFF,0x24,
+   0,0xA8,0xFF,0xFF,0xFF,0xAD,   0,   0,   0,   0,   0,0x37,0xFF,0xFF,0xFF,0xFF,0x1F,
+   0,0x9B,0xFF,0xFF,0xFF,0xB7,   0,   0,   0,   0,   0,0x40,0xFF,0xFF,0xFF,0xFF,0x13,
+   0,0x7E,0xFF,0xFF,0xFF,0xCD,   0,   0,   0,   0,   0,0x56,0xFF,0xFF,0xFF,0xF8,   0,
+   0,0x54,0xFF,0xFF,0xFF,0xF0,   0,   0,   0,   0,   0,0x7A,0xFF,0xFF,0xFF,0xD1,   0,
+   0,0x19,0xFD,0xFF,0xFF,0xFF,0x28,   0,   0,   0,   0,0xB2,0xFF,0xFF,0xFF,0x99,   0,
+   0,   0,0xC3,0xFF,0xFF,0xFF,0x8A,   0,   0,   0,0x1B,0xF7,0xFF,0xFF,0xFF,0x4A,   0,
+   0,   0,0x4C,0xFF,0xFF,0xFF,0xFA,0x64,0x0B,0x28,0xC6,0xFF,0xFF,0xFF,0xDC,0x02,   0,
+   0,   0,   0,0xAA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0x4A,   0,   0,
+   0,   0,   0,0x07,0xAC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFB,0x6B,   0,   0,   0,
+   0,   0,   0,   0,   0,0x4C,0xAB,0xE3,0xFA,0xFF,0xFF,0xFF,0xEC,0x2E,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0x50,0xFE,0xFF,0xFF,0xEE,0x35,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x86,0xFF,0xFF,0xFF,0xEF,0x16,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x02,0xB9,0xFF,0xF3,0x4F,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x12,0xBE,0x2D,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2045,32 +1781,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x23,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF3,0xDD,0xAA,0x58,0x06,   0,   0,   0,
-   0,0x23,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD8,0x33,   0,   0,
-   0,0x23,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEF,0x25,   0,
-   0,0x23,0xFF,0xFF,0xFF,0xE2,0x53,0x53,0x55,0x6E,0xAF,0xFE,0xFF,0xFF,0xFF,0xB1,   0,
-   0,0x23,0xFF,0xFF,0xFF,0xD3,   0,   0,   0,   0,   0,0x66,0xFF,0xFF,0xFF,0xFB,0x10,
-   0,0x23,0xFF,0xFF,0xFF,0xD3,   0,   0,   0,   0,   0,   0,0xE3,0xFF,0xFF,0xFF,0x35,
-   0,0x23,0xFF,0xFF,0xFF,0xD3,   0,   0,   0,   0,   0,   0,0xBF,0xFF,0xFF,0xFF,0x42,
-   0,0x23,0xFF,0xFF,0xFF,0xD3,   0,   0,   0,   0,   0,   0,0xE0,0xFF,0xFF,0xFF,0x2B,
-   0,0x23,0xFF,0xFF,0xFF,0xD3,   0,   0,   0,   0,   0,0x5F,0xFF,0xFF,0xFF,0xE2,0x02,
-   0,0x23,0xFF,0xFF,0xFF,0xE1,0x4F,0x4F,0x50,0x6B,0xA3,0xFC,0xFF,0xFF,0xFF,0x6F,   0,
-   0,0x23,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA5,0x02,   0,
-   0,0x23,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF1,0x72,0x03,   0,   0,
-   0,0x23,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xCE,0x01,   0,   0,   0,
-   0,0x23,0xFF,0xFF,0xFF,0xD3,   0,   0,0x06,0xE3,0xFF,0xFF,0xFF,0x50,   0,   0,   0,
-   0,0x23,0xFF,0xFF,0xFF,0xD3,   0,   0,   0,0x6D,0xFF,0xFF,0xFF,0xD0,0x01,   0,   0,
-   0,0x23,0xFF,0xFF,0xFF,0xD3,   0,   0,   0,0x09,0xE8,0xFF,0xFF,0xFF,0x52,   0,   0,
-   0,0x23,0xFF,0xFF,0xFF,0xD3,   0,   0,   0,   0,0x74,0xFF,0xFF,0xFF,0xD2,0x01,   0,
-   0,0x23,0xFF,0xFF,0xFF,0xD3,   0,   0,   0,   0,0x0C,0xEC,0xFF,0xFF,0xFF,0x54,   0,
-   0,0x23,0xFF,0xFF,0xFF,0xD3,   0,   0,   0,   0,   0,0x7B,0xFF,0xFF,0xFF,0xD3,0x01,
-   0,0x23,0xFF,0xFF,0xFF,0xD3,   0,   0,   0,   0,   0,0x0F,0xF0,0xFF,0xFF,0xFF,0x56,
-   0,0x23,0xFF,0xFF,0xFF,0xD3,   0,   0,   0,   0,   0,   0,0x82,0xFF,0xFF,0xFF,0xD5,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+0x1C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF8,0xEB,0xC8,0x94,0x3B,   0,   0,   0,   0,   0,
+0x1C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA7,0x06,   0,   0,   0,
+0x1C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x94,   0,   0,   0,
+0x1C,0xFF,0xFF,0xFF,0xFF,0x10,   0,0x10,0x42,0xD1,0xFF,0xFF,0xFF,0xFB,0x19,   0,   0,
+0x1C,0xFF,0xFF,0xFF,0xFF,0x10,   0,   0,   0,0x1E,0xFD,0xFF,0xFF,0xFF,0x5A,   0,   0,
+0x1C,0xFF,0xFF,0xFF,0xFF,0x10,   0,   0,   0,   0,0xD8,0xFF,0xFF,0xFF,0x7B,   0,   0,
+0x1C,0xFF,0xFF,0xFF,0xFF,0x10,   0,   0,   0,   0,0xC7,0xFF,0xFF,0xFF,0x87,   0,   0,
+0x1C,0xFF,0xFF,0xFF,0xFF,0x10,   0,   0,   0,   0,0xD9,0xFF,0xFF,0xFF,0x74,   0,   0,
+0x1C,0xFF,0xFF,0xFF,0xFF,0x10,   0,   0,   0,0x20,0xFD,0xFF,0xFF,0xFF,0x3C,   0,   0,
+0x1C,0xFF,0xFF,0xFF,0xFF,0x10,   0,0x10,0x42,0xD2,0xFF,0xFF,0xFF,0xCA,0x01,   0,   0,
+0x1C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD5,0x1E,   0,   0,   0,
+0x1C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE9,0x60,0x06,   0,   0,   0,   0,
+0x1C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC7,0x07,   0,   0,   0,   0,
+0x1C,0xFF,0xFF,0xFF,0xFF,0x10,0x09,0x64,0xFB,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,   0,
+0x1C,0xFF,0xFF,0xFF,0xFF,0x10,   0,   0,0x73,0xFF,0xFF,0xFF,0xF4,0x17,   0,   0,   0,
+0x1C,0xFF,0xFF,0xFF,0xFF,0x10,   0,   0,0x04,0xDA,0xFF,0xFF,0xFF,0x92,   0,   0,   0,
+0x1C,0xFF,0xFF,0xFF,0xFF,0x10,   0,   0,   0,0x5F,0xFF,0xFF,0xFF,0xF9,0x1F,   0,   0,
+0x1C,0xFF,0xFF,0xFF,0xFF,0x10,   0,   0,   0,0x03,0xDB,0xFF,0xFF,0xFF,0x9E,   0,   0,
+0x1C,0xFF,0xFF,0xFF,0xFF,0x10,   0,   0,   0,   0,0x5F,0xFF,0xFF,0xFF,0xFC,0x27,   0,
+0x1C,0xFF,0xFF,0xFF,0xFF,0x10,   0,   0,   0,   0,0x03,0xDB,0xFF,0xFF,0xFF,0xAA,   0,
+0x1C,0xFF,0xFF,0xFF,0xFF,0x10,   0,   0,   0,   0,   0,0x60,0xFF,0xFF,0xFF,0xFE,0x32,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2085,32 +1816,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x02,0x4C,0xA3,0xDA,0xF3,0xF8,0xE3,0xAE,0x5A,0x05,   0,   0,   0,
-   0,   0,   0,0x21,0xC8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD6,0x2F,   0,   0,
-   0,   0,0x16,0xE4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEC,0x25,   0,
-   0,   0,0x9C,0xFF,0xFF,0xFF,0xF4,0x8C,0x54,0x50,0x81,0xEE,0xFF,0xFF,0xFF,0xBB,   0,
-   0,0x01,0xF3,0xFF,0xFF,0xFE,0x3D,   0,   0,   0,   0,0x1E,0xF2,0xFF,0xFF,0xFF,0x26,
-   0,0x14,0xFF,0xFF,0xFF,0xD9,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x5D,
-   0,0x08,0xFD,0xFF,0xFF,0xEA,0x07,   0,   0,   0,   0,   0,0x26,0x53,0x53,0x53,0x24,
-   0,   0,0xC4,0xFF,0xFF,0xFF,0xB7,0x15,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x41,0xFD,0xFF,0xFF,0xFF,0xF4,0x95,0x42,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x64,0xFB,0xFF,0xFF,0xFF,0xFF,0xFF,0xE9,0x91,0x26,   0,   0,   0,   0,
-   0,   0,   0,   0,0x3A,0xD0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFB,0x97,0x0A,   0,   0,
-   0,   0,   0,   0,   0,0x01,0x49,0xAA,0xF3,0xFF,0xFF,0xFF,0xFF,0xFF,0xC7,0x0A,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x07,0x4A,0xB0,0xFF,0xFF,0xFF,0xFF,0x9C,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x49,0xF9,0xFF,0xFF,0xFC,0x1F,
-   0,0x75,0xA7,0xA7,0xA7,0x23,   0,   0,   0,   0,   0,   0,0x9E,0xFF,0xFF,0xFF,0x5D,
-   0,0x9D,0xFF,0xFF,0xFF,0x5E,   0,   0,   0,   0,   0,   0,0x80,0xFF,0xFF,0xFF,0x74,
-   0,0x59,0xFF,0xFF,0xFF,0xDF,0x12,   0,   0,   0,   0,0x07,0xCF,0xFF,0xFF,0xFF,0x59,
-   0,0x07,0xD8,0xFF,0xFF,0xFF,0xE6,0x77,0x48,0x3D,0x61,0xCD,0xFF,0xFF,0xFF,0xF6,0x11,
-   0,   0,0x30,0xEF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x6F,   0,
-   0,   0,   0,0x2B,0xCA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF6,0x6F,   0,   0,
-   0,   0,   0,   0,0x01,0x46,0x9E,0xD6,0xF2,0xFB,0xEB,0xC3,0x80,0x1D,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x10,0x73,0xBE,0xEA,0xFA,0xEE,0xD8,0xC0,0x86,0x44,0x09,   0,   0,
+   0,   0,   0,0x42,0xE8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x88,   0,   0,
+   0,   0,0x2C,0xF5,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x88,   0,   0,
+   0,   0,0xB3,0xFF,0xFF,0xFF,0xD9,0x4A,0x12,0x10,0x40,0xA6,0xFE,0xFF,0x88,   0,   0,
+   0,0x09,0xF9,0xFF,0xFF,0xFF,0x2F,   0,   0,   0,   0,   0,0x41,0xE4,0x88,   0,   0,
+   0,0x22,0xFF,0xFF,0xFF,0xF6,   0,   0,   0,   0,   0,   0,   0,0x20,0x65,   0,   0,
+   0,0x22,0xFF,0xFF,0xFF,0xFF,0x1F,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x04,0xF4,0xFF,0xFF,0xFF,0xC4,0x1C,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x98,0xFF,0xFF,0xFF,0xFF,0xF6,0x94,0x35,0x01,   0,   0,   0,   0,   0,   0,
+   0,   0,0x0F,0xCB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE3,0x85,0x17,   0,   0,   0,   0,
+   0,   0,   0,0x07,0x82,0xF4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF4,0x6A,   0,   0,   0,
+   0,   0,   0,   0,   0,0x14,0x77,0xD6,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x79,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0x28,0x87,0xF5,0xFF,0xFF,0xFF,0xFC,0x26,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x37,0xFA,0xFF,0xFF,0xFF,0x81,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,0xAC,   0,
+   0,0x17,0x85,0x02,   0,   0,   0,   0,   0,   0,   0,0x92,0xFF,0xFF,0xFF,0xAE,   0,
+   0,0x18,0xFF,0xBA,0x23,   0,   0,   0,   0,   0,0x04,0xD2,0xFF,0xFF,0xFF,0x91,   0,
+   0,0x18,0xFF,0xFF,0xF8,0x9B,0x43,0x16,0x0A,0x32,0xB0,0xFF,0xFF,0xFF,0xFF,0x49,   0,
+   0,0x18,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xBF,   0,   0,
+   0,0x18,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB8,0x10,   0,   0,
+   0,   0,0x25,0x64,0xA3,0xCB,0xE0,0xF4,0xFA,0xEE,0xCE,0x99,0x42,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2125,32 +1851,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-0x9F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-0x9F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-0x9F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-0x36,0x57,0x57,0x57,0x57,0x57,0x91,0xFF,0xFF,0xFF,0xC6,0x57,0x57,0x57,0x57,0x57,0x57,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA7,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA7,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA7,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA7,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA7,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA7,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA7,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA7,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA7,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA7,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA7,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA7,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA7,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA7,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA7,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA7,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xA7,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0xB8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x30,
+   0,0xB8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x30,
+   0,0xB8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x30,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2165,32 +1886,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x34,0xFF,0xFF,0xFF,0xC7,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0x97,   0,
-   0,0x34,0xFF,0xFF,0xFF,0xC7,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0x97,   0,
-   0,0x34,0xFF,0xFF,0xFF,0xC7,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0x97,   0,
-   0,0x35,0xFF,0xFF,0xFF,0xC8,   0,   0,   0,   0,   0,0x5D,0xFF,0xFF,0xFF,0x98,   0,
-   0,0x35,0xFF,0xFF,0xFF,0xC8,   0,   0,   0,   0,   0,0x5D,0xFF,0xFF,0xFF,0x98,   0,
-   0,0x35,0xFF,0xFF,0xFF,0xC8,   0,   0,   0,   0,   0,0x5D,0xFF,0xFF,0xFF,0x98,   0,
-   0,0x36,0xFF,0xFF,0xFF,0xC9,   0,   0,   0,   0,   0,0x5E,0xFF,0xFF,0xFF,0x99,   0,
-   0,0x36,0xFF,0xFF,0xFF,0xC9,   0,   0,   0,   0,   0,0x5E,0xFF,0xFF,0xFF,0x99,   0,
-   0,0x36,0xFF,0xFF,0xFF,0xC9,   0,   0,   0,   0,   0,0x5E,0xFF,0xFF,0xFF,0x99,   0,
-   0,0x36,0xFF,0xFF,0xFF,0xC9,   0,   0,   0,   0,   0,0x5E,0xFF,0xFF,0xFF,0x99,   0,
-   0,0x37,0xFF,0xFF,0xFF,0xCA,   0,   0,   0,   0,   0,0x5F,0xFF,0xFF,0xFF,0x9A,   0,
-   0,0x37,0xFF,0xFF,0xFF,0xCA,   0,   0,   0,   0,   0,0x5F,0xFF,0xFF,0xFF,0x9A,   0,
-   0,0x37,0xFF,0xFF,0xFF,0xCA,   0,   0,   0,   0,   0,0x5F,0xFF,0xFF,0xFF,0x9A,   0,
-   0,0x37,0xFF,0xFF,0xFF,0xCC,   0,   0,   0,   0,   0,0x61,0xFF,0xFF,0xFF,0x9A,   0,
-   0,0x29,0xFF,0xFF,0xFF,0xE2,   0,   0,   0,   0,   0,0x79,0xFF,0xFF,0xFF,0x8C,   0,
-   0,0x0F,0xFE,0xFF,0xFF,0xFC,0x09,   0,   0,   0,   0,0xA0,0xFF,0xFF,0xFF,0x71,   0,
-   0,   0,0xD0,0xFF,0xFF,0xFF,0x69,   0,   0,   0,0x1D,0xF1,0xFF,0xFF,0xFF,0x33,   0,
-   0,   0,0x69,0xFF,0xFF,0xFF,0xFB,0x86,0x4C,0x6D,0xE5,0xFF,0xFF,0xFF,0xCF,   0,   0,
-   0,   0,0x06,0xC9,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFB,0x3C,   0,   0,
-   0,   0,   0,0x17,0xC6,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF3,0x50,   0,   0,   0,
-   0,   0,   0,   0,0x02,0x5C,0xB5,0xE8,0xFA,0xEE,0xCA,0x82,0x16,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x80,0xFF,0xFF,0xFF,0xAC,   0,   0,   0,   0,   0,0x3C,0xFF,0xFF,0xFF,0xF0,   0,
+   0,0x80,0xFF,0xFF,0xFF,0xAC,   0,   0,   0,   0,   0,0x3C,0xFF,0xFF,0xFF,0xF0,   0,
+   0,0x80,0xFF,0xFF,0xFF,0xAC,   0,   0,   0,   0,   0,0x3C,0xFF,0xFF,0xFF,0xF0,   0,
+   0,0x80,0xFF,0xFF,0xFF,0xAC,   0,   0,   0,   0,   0,0x3C,0xFF,0xFF,0xFF,0xF0,   0,
+   0,0x80,0xFF,0xFF,0xFF,0xAC,   0,   0,   0,   0,   0,0x3C,0xFF,0xFF,0xFF,0xF0,   0,
+   0,0x80,0xFF,0xFF,0xFF,0xAC,   0,   0,   0,   0,   0,0x3C,0xFF,0xFF,0xFF,0xF0,   0,
+   0,0x80,0xFF,0xFF,0xFF,0xAC,   0,   0,   0,   0,   0,0x3C,0xFF,0xFF,0xFF,0xF0,   0,
+   0,0x80,0xFF,0xFF,0xFF,0xAC,   0,   0,   0,   0,   0,0x3C,0xFF,0xFF,0xFF,0xF0,   0,
+   0,0x80,0xFF,0xFF,0xFF,0xAC,   0,   0,   0,   0,   0,0x3C,0xFF,0xFF,0xFF,0xF0,   0,
+   0,0x80,0xFF,0xFF,0xFF,0xAC,   0,   0,   0,   0,   0,0x3C,0xFF,0xFF,0xFF,0xF0,   0,
+   0,0x80,0xFF,0xFF,0xFF,0xAC,   0,   0,   0,   0,   0,0x3C,0xFF,0xFF,0xFF,0xF0,   0,
+   0,0x80,0xFF,0xFF,0xFF,0xAC,   0,   0,   0,   0,   0,0x3C,0xFF,0xFF,0xFF,0xF0,   0,
+   0,0x80,0xFF,0xFF,0xFF,0xAC,   0,   0,   0,   0,   0,0x3C,0xFF,0xFF,0xFF,0xF0,   0,
+   0,0x7E,0xFF,0xFF,0xFF,0xAC,   0,   0,   0,   0,   0,0x3C,0xFF,0xFF,0xFF,0xEE,   0,
+   0,0x72,0xFF,0xFF,0xFF,0xAF,   0,   0,   0,   0,   0,0x3F,0xFF,0xFF,0xFF,0xE0,   0,
+   0,0x5A,0xFF,0xFF,0xFF,0xCC,   0,   0,   0,   0,   0,0x5E,0xFF,0xFF,0xFF,0xC9,   0,
+   0,0x27,0xFF,0xFF,0xFF,0xFB,0x27,   0,   0,   0,   0,0xB6,0xFF,0xFF,0xFF,0x96,   0,
+   0,   0,0xD2,0xFF,0xFF,0xFF,0xD9,0x43,0x0D,0x23,0x95,0xFF,0xFF,0xFF,0xFF,0x41,   0,
+   0,   0,0x4E,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xBC,   0,   0,
+   0,   0,   0,0x6E,0xFB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC4,0x15,   0,   0,
+   0,   0,   0,   0,0x24,0x8B,0xCA,0xED,0xFB,0xF4,0xDE,0xAA,0x54,0x03,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2205,32 +1921,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-0x6A,0xFF,0xFF,0xFF,0xF0,0x03,   0,   0,   0,   0,   0,   0,0x8D,0xFF,0xFF,0xFF,0xD0,
-0x1E,0xFF,0xFF,0xFF,0xFF,0x35,   0,   0,   0,   0,   0,   0,0xCE,0xFF,0xFF,0xFF,0x84,
-   0,0xD2,0xFF,0xFF,0xFF,0x76,   0,   0,   0,   0,   0,0x12,0xFD,0xFF,0xFF,0xFF,0x38,
-   0,0x86,0xFF,0xFF,0xFF,0xB7,   0,   0,   0,   0,   0,0x51,0xFF,0xFF,0xFF,0xEA,0x02,
-   0,0x3A,0xFF,0xFF,0xFF,0xF3,0x04,   0,   0,   0,   0,0x92,0xFF,0xFF,0xFF,0xA0,   0,
-   0,0x02,0xEB,0xFF,0xFF,0xFF,0x39,   0,   0,   0,   0,0xD4,0xFF,0xFF,0xFF,0x54,   0,
-   0,   0,0xA2,0xFF,0xFF,0xFF,0x7A,   0,   0,   0,0x16,0xFF,0xFF,0xFF,0xFA,0x0E,   0,
-   0,   0,0x56,0xFF,0xFF,0xFF,0xBB,   0,   0,   0,0x57,0xFF,0xFF,0xFF,0xBB,   0,   0,
-   0,   0,0x0F,0xFB,0xFF,0xFF,0xF6,0x06,   0,   0,0x98,0xFF,0xFF,0xFF,0x6F,   0,   0,
-   0,   0,   0,0xBE,0xFF,0xFF,0xFF,0x3D,   0,   0,0xDA,0xFF,0xFF,0xFF,0x24,   0,   0,
-   0,   0,   0,0x72,0xFF,0xFF,0xFF,0x7E,   0,0x1B,0xFF,0xFF,0xFF,0xD7,   0,   0,   0,
-   0,   0,   0,0x26,0xFF,0xFF,0xFF,0xBF,   0,0x5D,0xFF,0xFF,0xFF,0x8A,   0,   0,   0,
-   0,   0,   0,   0,0xDA,0xFF,0xFF,0xF8,0x08,0x9E,0xFF,0xFF,0xFF,0x3E,   0,   0,   0,
-   0,   0,   0,   0,0x8E,0xFF,0xFF,0xFF,0x42,0xDF,0xFF,0xFF,0xEF,0x04,   0,   0,   0,
-   0,   0,   0,   0,0x42,0xFF,0xFF,0xFF,0xA5,0xFF,0xFF,0xFF,0xA6,   0,   0,   0,   0,
-   0,   0,   0,   0,0x05,0xF1,0xFF,0xFF,0xFD,0xFF,0xFF,0xFF,0x5A,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xAA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFC,0x12,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x5E,0xFF,0xFF,0xFF,0xFF,0xFF,0xC1,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x15,0xFD,0xFF,0xFF,0xFF,0xFF,0x75,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0xC6,0xFF,0xFF,0xFF,0xFF,0x29,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x7A,0xFF,0xFF,0xFF,0xDE,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+0x13,0xFE,0xFF,0xFF,0xFF,0x1E,   0,   0,   0,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,0x88,
+   0,0xD4,0xFF,0xFF,0xFF,0x55,   0,   0,   0,   0,   0,   0,0xDE,0xFF,0xFF,0xFF,0x4B,
+   0,0x97,0xFF,0xFF,0xFF,0x8B,   0,   0,   0,   0,   0,0x14,0xFF,0xFF,0xFF,0xFD,0x10,
+   0,0x5A,0xFF,0xFF,0xFF,0xC1,   0,   0,   0,   0,   0,0x4B,0xFF,0xFF,0xFF,0xD0,   0,
+   0,0x1D,0xFF,0xFF,0xFF,0xF3,0x02,   0,   0,   0,   0,0x81,0xFF,0xFF,0xFF,0x93,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x2D,   0,   0,   0,   0,0xB8,0xFF,0xFF,0xFF,0x56,   0,
+   0,   0,0xA3,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,0xED,0xFF,0xFF,0xFF,0x19,   0,
+   0,   0,0x66,0xFF,0xFF,0xFF,0x99,   0,   0,   0,0x25,0xFF,0xFF,0xFF,0xDB,   0,   0,
+   0,   0,0x28,0xFF,0xFF,0xFF,0xCF,   0,   0,   0,0x5B,0xFF,0xFF,0xFF,0x9E,   0,   0,
+   0,   0,   0,0xEA,0xFF,0xFF,0xFB,0x09,   0,   0,0x92,0xFF,0xFF,0xFF,0x60,   0,   0,
+   0,   0,   0,0xAE,0xFF,0xFF,0xFF,0x3B,   0,   0,0xC8,0xFF,0xFF,0xFF,0x23,   0,   0,
+   0,   0,   0,0x71,0xFF,0xFF,0xFF,0x71,   0,0x06,0xF8,0xFF,0xFF,0xE6,   0,   0,   0,
+   0,   0,   0,0x34,0xFF,0xFF,0xFF,0xA7,   0,0x35,0xFF,0xFF,0xFF,0xA8,   0,   0,   0,
+   0,   0,   0,0x03,0xF3,0xFF,0xFF,0xDD,   0,0x6C,0xFF,0xFF,0xFF,0x6B,   0,   0,   0,
+   0,   0,   0,   0,0xBA,0xFF,0xFF,0xFF,0x13,0xA2,0xFF,0xFF,0xFF,0x2E,   0,   0,   0,
+   0,   0,   0,   0,0x7C,0xFF,0xFF,0xFF,0x49,0xD9,0xFF,0xFF,0xEF,0x01,   0,   0,   0,
+   0,   0,   0,   0,0x3F,0xFF,0xFF,0xFF,0x8F,0xFE,0xFF,0xFF,0xB3,   0,   0,   0,   0,
+   0,   0,   0,   0,0x08,0xF9,0xFF,0xFF,0xEF,0xFF,0xFF,0xFF,0x76,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0xC5,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x38,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x88,0xFF,0xFF,0xFF,0xFF,0xFF,0xF6,0x05,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x4B,0xFF,0xFF,0xFF,0xFF,0xFF,0xBE,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2245,32 +1956,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-0x8F,0xFF,0xFF,0xFF,0x0E,   0,   0,0xD6,0xFF,0xFF,0x25,   0,   0,0x9F,0xFF,0xFF,0xFE,
-0x6C,0xFF,0xFF,0xFF,0x2B,   0,0x01,0xF7,0xFF,0xFF,0x4B,   0,   0,0xBD,0xFF,0xFF,0xE3,
-0x4A,0xFF,0xFF,0xFF,0x49,   0,0x1C,0xFF,0xFF,0xFF,0x70,   0,   0,0xDC,0xFF,0xFF,0xC0,
-0x27,0xFF,0xFF,0xFF,0x67,   0,0x40,0xFF,0xFF,0xFF,0x96,   0,0x01,0xF9,0xFF,0xFF,0x9D,
-0x07,0xFD,0xFF,0xFF,0x85,   0,0x63,0xFF,0xFF,0xFF,0xBB,   0,0x19,0xFF,0xFF,0xFF,0x7A,
-   0,0xE2,0xFF,0xFF,0xA2,   0,0x86,0xFF,0xFF,0xFF,0xE1,   0,0x37,0xFF,0xFF,0xFF,0x57,
-   0,0xC0,0xFF,0xFF,0xC0,   0,0xAA,0xFF,0xFF,0xFF,0xFE,0x09,0x56,0xFF,0xFF,0xFF,0x34,
-   0,0x9D,0xFF,0xFF,0xDE,   0,0xCD,0xFF,0xFF,0xFF,0xFF,0x2C,0x74,0xFF,0xFF,0xFF,0x11,
-   0,0x7B,0xFF,0xFF,0xFA,0x02,0xF0,0xFF,0xFD,0xFF,0xFF,0x51,0x92,0xFF,0xFF,0xEF,   0,
-   0,0x58,0xFF,0xFF,0xFF,0x2E,0xFF,0xFF,0xC5,0xFF,0xFF,0x77,0xB1,0xFF,0xFF,0xCC,   0,
-   0,0x36,0xFF,0xFF,0xFF,0x6F,0xFF,0xFF,0x77,0xFE,0xFF,0x9C,0xCF,0xFF,0xFF,0xA9,   0,
-   0,0x13,0xFF,0xFF,0xFF,0xB1,0xFF,0xFF,0x43,0xE2,0xFF,0xC2,0xEE,0xFF,0xFF,0x86,   0,
-   0,   0,0xF1,0xFF,0xFF,0xF1,0xFF,0xFF,0x1B,0xB9,0xFF,0xEF,0xFF,0xFF,0xFF,0x63,   0,
-   0,   0,0xCE,0xFF,0xFF,0xFF,0xFF,0xF3,   0,0x90,0xFF,0xFF,0xFF,0xFF,0xFF,0x40,   0,
-   0,   0,0xAC,0xFF,0xFF,0xFF,0xFF,0xCC,   0,0x67,0xFF,0xFF,0xFF,0xFF,0xFF,0x1D,   0,
-   0,   0,0x89,0xFF,0xFF,0xFF,0xFF,0xA4,   0,0x3E,0xFF,0xFF,0xFF,0xFF,0xF9,0x02,   0,
-   0,   0,0x67,0xFF,0xFF,0xFF,0xFF,0x7D,   0,0x15,0xFF,0xFF,0xFF,0xFF,0xD8,   0,   0,
-   0,   0,0x44,0xFF,0xFF,0xFF,0xFF,0x55,   0,   0,0xEC,0xFF,0xFF,0xFF,0xB5,   0,   0,
-   0,   0,0x22,0xFF,0xFF,0xFF,0xFF,0x2E,   0,   0,0xC3,0xFF,0xFF,0xFF,0x92,   0,   0,
-   0,   0,0x04,0xFB,0xFF,0xFF,0xFD,0x09,   0,   0,0x9A,0xFF,0xFF,0xFF,0x6F,   0,   0,
-   0,   0,   0,0xDD,0xFF,0xFF,0xDF,   0,   0,   0,0x70,0xFF,0xFF,0xFF,0x4C,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+0xF0,0xFF,0xFF,0xB4,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x42,0xFF,0xFF,0xFF,
+0xD1,0xFF,0xFF,0xCD,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x56,0xFF,0xFF,0xFF,
+0xB1,0xFF,0xFF,0xE7,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x6A,0xFF,0xFF,0xFF,
+0x91,0xFF,0xFF,0xFD,0x03,   0,   0,   0,   0,   0,   0,   0,   0,0x7E,0xFF,0xFF,0xFF,
+0x71,0xFF,0xFF,0xFF,0x1A,   0,   0,   0,   0,   0,   0,   0,   0,0x92,0xFF,0xFF,0xEE,
+0x51,0xFF,0xFF,0xFF,0x33,   0,0x16,0xFF,0xFF,0xFF,0x92,   0,   0,0xA6,0xFF,0xFF,0xD1,
+0x32,0xFF,0xFF,0xFF,0x4D,   0,0x45,0xFF,0xFF,0xFF,0xC7,   0,   0,0xBA,0xFF,0xFF,0xB3,
+0x12,0xFF,0xFF,0xFF,0x66,   0,0x72,0xFF,0xFF,0xFF,0xF7,0x04,   0,0xCE,0xFF,0xFF,0x96,
+   0,0xF1,0xFF,0xFF,0x7F,   0,0xA0,0xFF,0xFF,0xFF,0xFF,0x31,   0,0xE2,0xFF,0xFF,0x78,
+   0,0xD2,0xFF,0xFF,0x99,   0,0xCE,0xFF,0xF9,0xFF,0xFF,0x66,   0,0xF6,0xFF,0xFF,0x5B,
+   0,0xB2,0xFF,0xFF,0xB2,0x03,0xF7,0xFF,0xA7,0xFF,0xFF,0x9B,0x09,0xFF,0xFF,0xFF,0x3D,
+   0,0x93,0xFF,0xFF,0xCC,0x29,0xFF,0xFF,0x59,0xE4,0xFF,0xD0,0x1E,0xFF,0xFF,0xFF,0x20,
+   0,0x73,0xFF,0xFF,0xE5,0x57,0xFF,0xFF,0x27,0xAE,0xFF,0xFB,0x3B,0xFF,0xFF,0xFD,0x05,
+   0,0x53,0xFF,0xFF,0xFC,0x87,0xFF,0xF2,0x01,0x78,0xFF,0xFF,0x80,0xFF,0xFF,0xE5,   0,
+   0,0x33,0xFF,0xFF,0xFF,0xCA,0xFF,0xC1,   0,0x41,0xFF,0xFF,0xC9,0xFF,0xFF,0xC7,   0,
+   0,0x13,0xFF,0xFF,0xFF,0xFD,0xFF,0x8E,   0,0x0D,0xFD,0xFF,0xFD,0xFF,0xFF,0xAA,   0,
+   0,   0,0xF3,0xFF,0xFF,0xFF,0xFF,0x5C,   0,   0,0xD5,0xFF,0xFF,0xFF,0xFF,0x8C,   0,
+   0,   0,0xD4,0xFF,0xFF,0xFF,0xFF,0x29,   0,   0,0x9E,0xFF,0xFF,0xFF,0xFF,0x6F,   0,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0xF4,0x02,   0,   0,0x68,0xFF,0xFF,0xFF,0xFF,0x51,   0,
+   0,   0,0x94,0xFF,0xFF,0xFF,0xC3,   0,   0,   0,0x32,0xFF,0xFF,0xFF,0xFF,0x34,   0,
+   0,   0,0x74,0xFF,0xFF,0xFF,0x91,   0,   0,   0,0x04,0xF6,0xFF,0xFF,0xFF,0x16,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2285,32 +1991,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-0x29,0xFC,0xFF,0xFF,0xFF,0x75,   0,   0,   0,   0,   0,   0,0xBF,0xFF,0xFF,0xFF,0xDE,
-   0,0x99,0xFF,0xFF,0xFF,0xE9,0x0A,   0,   0,   0,   0,0x3D,0xFF,0xFF,0xFF,0xFF,0x58,
-   0,0x18,0xF3,0xFF,0xFF,0xFF,0x70,   0,   0,   0,   0,0xBC,0xFF,0xFF,0xFF,0xCA,0x01,
-   0,   0,0x7F,0xFF,0xFF,0xFF,0xE6,0x08,   0,   0,0x3A,0xFF,0xFF,0xFF,0xFF,0x3F,   0,
-   0,   0,0x0B,0xE6,0xFF,0xFF,0xFF,0x6B,   0,   0,0xB8,0xFF,0xFF,0xFF,0xB1,   0,   0,
-   0,   0,   0,0x65,0xFF,0xFF,0xFF,0xE2,0x06,0x37,0xFF,0xFF,0xFF,0xFC,0x28,   0,   0,
-   0,   0,   0,0x03,0xD5,0xFF,0xFF,0xFF,0x65,0xB5,0xFF,0xFF,0xFF,0x97,   0,   0,   0,
-   0,   0,   0,   0,0x4B,0xFF,0xFF,0xFF,0xEB,0xFF,0xFF,0xFF,0xF3,0x17,   0,   0,   0,
-   0,   0,   0,   0,   0,0xBE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7D,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x33,0xFE,0xFF,0xFF,0xFF,0xFF,0xE6,0x0A,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0xC4,0xFF,0xFF,0xFF,0xFF,0x83,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x2F,0xFD,0xFF,0xFF,0xFF,0xFF,0xE2,0x09,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xBE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7D,   0,   0,   0,   0,
-   0,   0,   0,   0,0x50,0xFF,0xFF,0xFF,0xDF,0xF8,0xFF,0xFF,0xF4,0x1A,   0,   0,   0,
-   0,   0,   0,0x06,0xDB,0xFF,0xFF,0xFF,0x5B,0x94,0xFF,0xFF,0xFF,0x9F,   0,   0,   0,
-   0,   0,   0,0x73,0xFF,0xFF,0xFF,0xD9,0x03,0x1C,0xF8,0xFF,0xFF,0xFE,0x33,   0,   0,
-   0,   0,0x14,0xF0,0xFF,0xFF,0xFF,0x5C,   0,   0,0x94,0xFF,0xFF,0xFF,0xC1,   0,   0,
-   0,   0,0x96,0xFF,0xFF,0xFF,0xDA,0x03,   0,   0,0x1C,0xF8,0xFF,0xFF,0xFF,0x53,   0,
-   0,0x2B,0xFC,0xFF,0xFF,0xFF,0x5D,   0,   0,   0,   0,0x94,0xFF,0xFF,0xFF,0xDD,0x07,
-   0,0xB9,0xFF,0xFF,0xFF,0xDB,0x03,   0,   0,   0,   0,0x1C,0xF8,0xFF,0xFF,0xFF,0x75,
-0x4B,0xFF,0xFF,0xFF,0xFF,0x5F,   0,   0,   0,   0,   0,   0,0x94,0xFF,0xFF,0xFF,0xF1,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+0x2D,0xFC,0xFF,0xFF,0xFC,0x2C,   0,   0,   0,   0,   0,   0,0xB3,0xFF,0xFF,0xFF,0x9D,
+   0,0x94,0xFF,0xFF,0xFF,0xBC,   0,   0,   0,   0,   0,0x46,0xFF,0xFF,0xFF,0xF1,0x17,
+   0,0x12,0xEC,0xFF,0xFF,0xFF,0x4F,   0,   0,   0,0x04,0xD6,0xFF,0xFF,0xFF,0x74,   0,
+   0,   0,0x6A,0xFF,0xFF,0xFF,0xDB,0x06,   0,   0,0x70,0xFF,0xFF,0xFF,0xDA,0x06,   0,
+   0,   0,0x03,0xD1,0xFF,0xFF,0xFF,0x75,   0,0x14,0xEF,0xFF,0xFF,0xFF,0x4B,   0,   0,
+   0,   0,   0,0x3F,0xFF,0xFF,0xFF,0xF1,0x17,0x98,0xFF,0xFF,0xFF,0xB7,   0,   0,   0,
+   0,   0,   0,   0,0xAA,0xFF,0xFF,0xFF,0xBC,0xFD,0xFF,0xFF,0xFA,0x28,   0,   0,   0,
+   0,   0,   0,   0,0x1E,0xF6,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x8E,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,0xEA,0x0F,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x09,0xE1,0xFF,0xFF,0xFF,0xFF,0x65,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x95,0xFF,0xFF,0xFF,0xFC,0x14,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x20,0xF7,0xFF,0xFF,0xFF,0xFF,0x93,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0xAD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFB,0x2B,   0,   0,   0,   0,
+   0,   0,   0,   0,0x42,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xBB,   0,   0,   0,   0,
+   0,   0,   0,0x03,0xD3,0xFF,0xFF,0xFF,0x89,0xEF,0xFF,0xFF,0xFF,0x50,   0,   0,   0,
+   0,   0,   0,0x6C,0xFF,0xFF,0xFF,0xDA,0x06,0x6F,0xFF,0xFF,0xFF,0xDC,0x07,   0,   0,
+   0,   0,0x13,0xEE,0xFF,0xFF,0xFF,0x4D,   0,0x04,0xD6,0xFF,0xFF,0xFF,0x78,   0,   0,
+   0,   0,0x96,0xFF,0xFF,0xFF,0xB9,   0,   0,   0,0x45,0xFF,0xFF,0xFF,0xF3,0x19,   0,
+   0,0x2E,0xFC,0xFF,0xFF,0xFB,0x2A,   0,   0,   0,   0,0xB0,0xFF,0xFF,0xFF,0xA1,   0,
+   0,0xBF,0xFF,0xFF,0xFF,0x91,   0,   0,   0,   0,   0,0x23,0xF8,0xFF,0xFF,0xFE,0x36,
+0x55,0xFF,0xFF,0xFF,0xEC,0x11,   0,   0,   0,   0,   0,   0,0x86,0xFF,0xFF,0xFF,0xC8,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2325,32 +2026,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-0x4C,0xFF,0xFF,0xFF,0xF6,0x13,   0,   0,   0,   0,   0,   0,0x43,0xFF,0xFF,0xFF,0xFA,
-0x01,0xD2,0xFF,0xFF,0xFF,0x77,   0,   0,   0,   0,   0,   0,0xB0,0xFF,0xFF,0xFF,0x9E,
-   0,0x5B,0xFF,0xFF,0xFF,0xE1,0x03,   0,   0,   0,   0,0x20,0xFD,0xFF,0xFF,0xFE,0x28,
-   0,0x04,0xDF,0xFF,0xFF,0xFF,0x51,   0,   0,   0,   0,0x8A,0xFF,0xFF,0xFF,0xAE,   0,
-   0,   0,0x6B,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,0x09,0xEE,0xFF,0xFF,0xFF,0x36,   0,
-   0,   0,0x09,0xEA,0xFF,0xFF,0xFF,0x2D,   0,   0,0x65,0xFF,0xFF,0xFF,0xBD,   0,   0,
-   0,   0,   0,0x7B,0xFF,0xFF,0xFF,0x99,   0,   0,0xD2,0xFF,0xFF,0xFF,0x45,   0,   0,
-   0,   0,   0,0x10,0xF2,0xFF,0xFF,0xF5,0x11,0x40,0xFF,0xFF,0xFF,0xCD,   0,   0,   0,
-   0,   0,   0,   0,0x8B,0xFF,0xFF,0xFF,0x74,0xAD,0xFF,0xFF,0xFF,0x54,   0,   0,   0,
-   0,   0,   0,   0,0x1A,0xF9,0xFF,0xFF,0xE6,0xFC,0xFF,0xFF,0xDA,0x02,   0,   0,   0,
-   0,   0,   0,   0,   0,0x9B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x26,0xFD,0xFF,0xFF,0xFF,0xFF,0xE5,0x06,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0xAB,0xFF,0xFF,0xFF,0xFF,0x73,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x3B,0xFF,0xFF,0xFF,0xF1,0x0C,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x23,0xFF,0xFF,0xFF,0xD6,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x23,0xFF,0xFF,0xFF,0xD6,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x22,0xFF,0xFF,0xFF,0xD5,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x22,0xFF,0xFF,0xFF,0xD5,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x21,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x21,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x20,0xFF,0xFF,0xFF,0xD3,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+0xA3,0xFF,0xFF,0xFF,0xD7,0x02,   0,   0,   0,   0,   0,   0,0x67,0xFF,0xFF,0xFF,0xF8,
+0x23,0xFB,0xFF,0xFF,0xFF,0x56,   0,   0,   0,   0,   0,0x04,0xDF,0xFF,0xFF,0xFF,0x92,
+   0,0x9C,0xFF,0xFF,0xFF,0xD2,0x01,   0,   0,   0,   0,0x61,0xFF,0xFF,0xFF,0xF6,0x19,
+   0,0x1F,0xF9,0xFF,0xFF,0xFF,0x50,   0,   0,   0,0x03,0xDA,0xFF,0xFF,0xFF,0x8C,   0,
+   0,   0,0x95,0xFF,0xFF,0xFF,0xCC,   0,   0,   0,0x5B,0xFF,0xFF,0xFF,0xF3,0x15,   0,
+   0,   0,0x1A,0xF7,0xFF,0xFF,0xFF,0x49,   0,0x02,0xD6,0xFF,0xFF,0xFF,0x85,   0,   0,
+   0,   0,   0,0x8F,0xFF,0xFF,0xFF,0xC6,   0,0x56,0xFF,0xFF,0xFF,0xF0,0x11,   0,   0,
+   0,   0,   0,0x16,0xF4,0xFF,0xFF,0xFF,0x43,0xD1,0xFF,0xFF,0xFF,0x7E,   0,   0,   0,
+   0,   0,   0,   0,0x88,0xFF,0xFF,0xFF,0xE8,0xFF,0xFF,0xFF,0xED,0x0E,   0,   0,   0,
+   0,   0,   0,   0,0x13,0xF2,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x82,0xFF,0xFF,0xFF,0xFF,0xFF,0xE9,0x0B,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x0F,0xEE,0xFF,0xFF,0xFF,0xFF,0x71,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x7F,0xFF,0xFF,0xFF,0xEA,0x08,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2365,32 +2061,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0xB7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x13,
-   0,0xB7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x15,
-   0,0xB7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF1,0x0C,
-   0,0x3F,0x57,0x57,0x57,0x57,0x57,0x57,0x57,0x57,0x5E,0xF3,0xFF,0xFF,0xFF,0x65,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x83,0xFF,0xFF,0xFF,0xBD,0x01,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x30,0xFB,0xFF,0xFF,0xF5,0x21,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x04,0xCE,0xFF,0xFF,0xFF,0x6F,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x7C,0xFF,0xFF,0xFF,0xC5,0x02,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x2B,0xF9,0xFF,0xFF,0xF8,0x28,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x03,0xC9,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x75,0xFF,0xFF,0xFF,0xCD,0x04,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x26,0xF7,0xFF,0xFF,0xFA,0x2F,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x02,0xC4,0xFF,0xFF,0xFF,0x82,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x6F,0xFF,0xFF,0xFF,0xD5,0x06,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x22,0xF5,0xFF,0xFF,0xFC,0x37,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x01,0xBE,0xFF,0xFF,0xFF,0x8C,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x68,0xFF,0xFF,0xFF,0xDB,0x09,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x1E,0xF2,0xFF,0xFF,0xFF,0x88,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x18,
-   0,0xA5,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x53,
-   0,0xBB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x53,
-   0,0xBB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x53,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x3C,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x3C,
+   0,0x10,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x3C,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x37,0xFD,0xFF,0xFF,0xFF,0xFF,0x2C,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0x07,0xD5,0xFF,0xFF,0xFF,0xFF,0x98,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0x85,0xFF,0xFF,0xFF,0xFF,0xDE,0x0C,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0x32,0xFB,0xFF,0xFF,0xFF,0xFE,0x3F,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x05,0xD0,0xFF,0xFF,0xFF,0xFF,0x8F,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x7F,0xFF,0xFF,0xFF,0xFF,0xD8,0x09,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x2D,0xF9,0xFF,0xFF,0xFF,0xFC,0x37,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x03,0xCB,0xFF,0xFF,0xFF,0xFF,0x86,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x78,0xFF,0xFF,0xFF,0xFF,0xD2,0x06,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x28,0xF8,0xFF,0xFF,0xFF,0xFA,0x31,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x02,0xC6,0xFF,0xFF,0xFF,0xFF,0x7D,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x71,0xFF,0xFF,0xFF,0xFF,0xCB,0x04,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x23,0xF5,0xFF,0xFF,0xFF,0xF8,0x2A,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x01,0xC0,0xFF,0xFF,0xFF,0xFF,0x74,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x50,0xFF,0xFF,0xFF,0xFF,0xC4,0x02,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x60,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x70,
+   0,0x60,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x70,
+   0,0x60,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x70,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2404,37 +2095,32 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x0A,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0xA4,0x1F,0x1F,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x2C,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x2C,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x2C,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x2C,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x2C,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x2C,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2445,35 +2131,30 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x6D,0xFF,0xFF,0xFF,0x3D,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x19,0xFD,0xFF,0xFF,0x93,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0xC1,0xFF,0xFF,0xE7,0x02,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x6B,0xFF,0xFF,0xFF,0x3F,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x18,0xFD,0xFF,0xFF,0x95,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xC0,0xFF,0xFF,0xE9,0x03,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x6A,0xFF,0xFF,0xFF,0x41,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x17,0xFD,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0xBE,0xFF,0xFF,0xEA,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x69,0xFF,0xFF,0xFF,0x43,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x16,0xFC,0xFF,0xFF,0x99,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0xBD,0xFF,0xFF,0xEB,0x04,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x67,0xFF,0xFF,0xFF,0x45,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x15,0xFC,0xFF,0xFF,0x9B,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xBC,0xFF,0xFF,0xED,0x04,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x66,0xFF,0xFF,0xFF,0x47,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x14,0xFB,0xFF,0xFF,0x9D,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0xBA,0xFF,0xFF,0xEE,0x05,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x64,0xFF,0xFF,0xFF,0x49,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x13,0xFB,0xFF,0xFF,0x9F,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xB9,0xFF,0xFF,0xEF,0x06,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x63,0xFF,0xFF,0xFF,0x4B,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x12,0xF7,0xFB,0xFB,0x9E,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x31,0xFF,0xFF,0xEC,0x0A,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xBA,0xFF,0xFF,0x6D,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x44,0xFF,0xFF,0xE0,0x04,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xCC,0xFF,0xFF,0x5A,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x56,0xFF,0xFF,0xD0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x03,0xDC,0xFF,0xFF,0x48,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x69,0xFF,0xFF,0xBE,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x08,0xE9,0xFF,0xFF,0x35,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x7C,0xFF,0xFF,0xAC,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x11,0xF3,0xFF,0xFD,0x25,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x8E,0xFF,0xFF,0x99,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x1D,0xFA,0xFF,0xF8,0x17,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xA1,0xFF,0xFF,0x86,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x2B,0xFE,0xFF,0xEF,0x0D,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0xB4,0xFF,0xFF,0x74,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0x3D,0xFF,0xFF,0xE4,0x06,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0xC6,0xFF,0xFF,0x61,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0x50,0xFF,0xFF,0xD6,0x01,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0x01,0xD7,0xFF,0xFF,0x4E,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x62,0xFF,0xFF,0xC5,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x06,0xE5,0xFF,0xFF,0x3C,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x75,0xFF,0xFF,0xB2,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x0E,0xF0,0xFF,0xFE,0x2B,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x87,0xFF,0xFF,0xA0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2484,37 +2165,32 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x0A,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x0A,0x1F,0x1F,0xEE,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,
+   0,   0,   0,   0,0xB4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0xB4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0xB4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x48,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x48,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x48,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x48,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x48,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x48,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x48,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x48,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x48,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x48,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x48,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x48,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x48,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x48,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x48,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x48,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x48,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x48,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x48,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x48,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0xB4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0xB4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0xB4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2525,23 +2201,18 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x63,0xFF,0xFF,0xFF,0xD0,0x09,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x31,0xF7,0xFF,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x11,0xDE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x66,   0,   0,   0,   0,
+   0,   0,   0,0x01,0xB3,0xFF,0xFF,0xFF,0xE3,0xFF,0xFF,0xFF,0xF8,0x33,   0,   0,   0,
+   0,   0,   0,0x7C,0xFF,0xFF,0xFF,0xCA,0x11,0x6D,0xFE,0xFF,0xFF,0xDF,0x12,   0,   0,
+   0,   0,0x44,0xFD,0xFF,0xFF,0xC4,0x0E,   0,   0,0x64,0xFD,0xFF,0xFF,0xB6,0x01,   0,
+   0,0x1C,0xEA,0xFF,0xFF,0xBE,0x0B,   0,   0,   0,   0,0x5B,0xFC,0xFF,0xFF,0x7E,   0,
+0x05,0xC7,0xFF,0xFF,0xB7,0x09,   0,   0,   0,   0,   0,   0,0x53,0xFA,0xFF,0xFD,0x47,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0xAD,0xFF,0xFF,0x93,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x1A,0xFB,0xFF,0xFF,0xF1,0x0B,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x7F,0xFF,0xFF,0xFF,0xFF,0x65,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x03,0xE4,0xFF,0xE8,0xFA,0xFF,0xCE,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x51,0xFF,0xFF,0xA1,0xC2,0xFF,0xFF,0x36,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xBA,0xFF,0xFF,0x45,0x64,0xFF,0xFF,0x9F,   0,   0,   0,   0,
-   0,   0,   0,   0,0x24,0xFE,0xFF,0xE2,0x02,0x0D,0xF5,0xFF,0xF6,0x11,   0,   0,   0,
-   0,   0,   0,   0,0x8C,0xFF,0xFF,0x83,   0,   0,0xA0,0xFF,0xFF,0x70,   0,   0,   0,
-   0,   0,   0,0x08,0xEC,0xFF,0xFF,0x23,   0,   0,0x3D,0xFF,0xFF,0xD8,   0,   0,   0,
-   0,   0,   0,0x5E,0xFF,0xFF,0xC1,   0,   0,   0,   0,0xDA,0xFF,0xFF,0x42,   0,   0,
-   0,   0,   0,0xC7,0xFF,0xFF,0x60,   0,   0,   0,   0,0x79,0xFF,0xFF,0xAB,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2589,30 +2260,20 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x1C,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,   0,   0,
-   0,   0,0xE7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x03,   0,
-   0,   0,0xE7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x03,   0,
-   0,   0,0xE7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x03,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
 // '`'
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x01,0x07,0x07,0x07,0x07,0x01,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x03,0xAE,0xFF,0xFF,0xFF,0x7B,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x07,0xBC,0xFF,0xFF,0xF7,0x23,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x0C,0xC9,0xFF,0xFF,0xB9,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x12,0xD4,0xFF,0xFF,0x58,   0,   0,   0,   0,
+   0,   0,0x04,0xA7,0xFF,0xFF,0xFA,0x3B,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x02,0x9E,0xFF,0xFF,0xE7,0x1A,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x01,0x95,0xFF,0xFF,0xC8,0x07,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x8B,0xFF,0xFF,0x9C,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x82,0xFF,0xFF,0x69,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2650,27 +2311,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,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x20,0x87,0xCC,0xEF,0xFB,0xEC,0xBE,0x72,0x10,   0,   0,   0,   0,
-   0,   0,   0,0x6A,0xF8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE9,0x3F,   0,   0,   0,
-   0,   0,0x53,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF4,0x1E,   0,   0,
-   0,   0,0xD0,0xFF,0xFF,0xFF,0x8C,0x1D,0x0F,0x3C,0xCA,0xFF,0xFF,0xFF,0x94,   0,   0,
-   0,0x01,0xB5,0xB7,0xB7,0xB1,   0,   0,   0,   0,0x24,0xFF,0xFF,0xFF,0xD9,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xFC,0xFF,0xFF,0xF0,   0,   0,
-   0,   0,   0,   0,0x3A,0x95,0xCC,0xEE,0xFB,0xFF,0xFF,0xFF,0xFF,0xFF,0xF3,   0,   0,
-   0,   0,0x08,0xA4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF3,   0,   0,
-   0,   0,0x98,0xFF,0xFF,0xFF,0xF4,0x97,0x6B,0x63,0x63,0xFD,0xFF,0xFF,0xF3,   0,   0,
-   0,0x16,0xFC,0xFF,0xFF,0xF1,0x23,   0,   0,   0,   0,0xFB,0xFF,0xFF,0xF3,   0,   0,
-   0,0x4C,0xFF,0xFF,0xFF,0xA6,   0,   0,   0,   0,   0,0xFB,0xFF,0xFF,0xF3,   0,   0,
-   0,0x58,0xFF,0xFF,0xFF,0xAC,   0,   0,   0,   0,0x3B,0xFF,0xFF,0xFF,0xF3,   0,   0,
-   0,0x30,0xFF,0xFF,0xFF,0xFD,0x70,0x24,0x2E,0x7B,0xF5,0xFF,0xFF,0xFF,0xF6,   0,   0,
-   0,   0,0xC6,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0x04,   0,
-   0,   0,0x1F,0xDE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xDC,0xE1,0xFF,0xFF,0xFF,0x2C,   0,
-   0,   0,   0,0x0E,0x80,0xD3,0xF6,0xF3,0xCF,0x79,0x0D,0x98,0xFF,0xFF,0xFF,0x78,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x30,0x7C,0xB3,0xD0,0xE6,0xFA,0xF3,0xE0,0xB1,0x60,0x07,   0,   0,   0,
+   0,   0,0x18,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD0,0x1A,   0,   0,
+   0,   0,0x18,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB7,   0,   0,
+   0,   0,0x17,0xD3,0x8A,0x51,0x31,0x1B,0x06,0x13,0x59,0xF0,0xFF,0xFF,0xFF,0x27,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x83,0xFF,0xFF,0xFF,0x69,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x70,0xFF,0xFF,0xFF,0x93,   0,
+   0,   0,   0,0x0D,0x6A,0xB1,0xDB,0xF2,0xFD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA3,   0,
+   0,   0,0x40,0xEB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xAE,   0,
+   0,0x18,0xF0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB0,   0,
+   0,0x75,0xFF,0xFF,0xFF,0xFF,0xAA,0x38,0x11,0x03,   0,0x7B,0xFF,0xFF,0xFF,0xB0,   0,
+   0,0xA0,0xFF,0xFF,0xFF,0xE4,0x01,   0,   0,   0,   0,0xA0,0xFF,0xFF,0xFF,0xB0,   0,
+   0,0xA2,0xFF,0xFF,0xFF,0xD5,   0,   0,   0,   0,0x19,0xF3,0xFF,0xFF,0xFF,0xB0,   0,
+   0,0x77,0xFF,0xFF,0xFF,0xFF,0x7E,0x14,0x11,0x48,0xD7,0xFF,0xFF,0xFF,0xFF,0xB0,   0,
+   0,0x1C,0xF7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFD,0xFF,0xFF,0xFF,0xB0,   0,
+   0,   0,0x57,0xF9,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD6,0x87,0xFF,0xFF,0xFF,0xB0,   0,
+   0,   0,   0,0x29,0x99,0xDB,0xF7,0xF4,0xCF,0x77,0x08,0x70,0xFF,0xFF,0xFF,0xB0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2684,33 +2340,28 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x09,0x71,0xD1,0xF6,0xF2,0xBE,0x4A,   0,   0,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0xC0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x9D,0x02,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x73,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0xFB,0x92,0x56,0x63,0xCE,0xFF,0xFF,0xFF,0xF2,0x0D,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x55,   0,   0,   0,0x0E,0xDB,0xFF,0xFF,0xFF,0x5A,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x04,   0,   0,   0,   0,0x72,0xFF,0xFF,0xFF,0x91,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,0x3D,0xFF,0xFF,0xFF,0xAA,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,0x29,0xFF,0xFF,0xFF,0xC2,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,0x27,0xFF,0xFF,0xFF,0xC4,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,0x38,0xFF,0xFF,0xFF,0xB1,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x03,   0,   0,   0,   0,0x6B,0xFF,0xFF,0xFF,0x93,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0x4B,   0,   0,   0,0x08,0xD1,0xFF,0xFF,0xFF,0x54,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0xF4,0x82,0x47,0x54,0xC1,0xFF,0xFF,0xFF,0xED,0x0D,   0,
-   0,   0,0xEB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x78,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xD6,0xD6,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x9B,0x01,   0,   0,
-   0,   0,0xEB,0xFF,0xFF,0xAC,0x0C,0x78,0xD3,0xF4,0xE7,0xBD,0x50,0x01,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,0x1A,0x9B,0xE6,0xF8,0xDE,0x94,0x19,   0,   0,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x6B,0xEA,0xFF,0xFF,0xFF,0xFF,0xFF,0xED,0x2E,   0,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0xF7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xDE,0x08,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0xFF,0xB7,0x21,0x0E,0x7D,0xFF,0xFF,0xFF,0xFF,0x6A,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0xEA,0x0C,   0,   0,   0,0xAB,0xFF,0xFF,0xFF,0xC1,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x92,   0,   0,   0,   0,0x47,0xFF,0xFF,0xFF,0xF5,0x02,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x5E,   0,   0,   0,   0,0x13,0xFF,0xFF,0xFF,0xFF,0x1A,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x49,   0,   0,   0,   0,   0,0xFD,0xFF,0xFF,0xFF,0x29,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x48,   0,   0,   0,   0,   0,0xFD,0xFF,0xFF,0xFF,0x28,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x5E,   0,   0,   0,   0,0x13,0xFF,0xFF,0xFF,0xFF,0x1B,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x92,   0,   0,   0,   0,0x46,0xFF,0xFF,0xFF,0xF5,0x02,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0xEA,0x0C,   0,   0,   0,0xAB,0xFF,0xFF,0xFF,0xC2,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0xFF,0xB7,0x20,0x0D,0x7C,0xFF,0xFF,0xFF,0xFF,0x6C,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0xF3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE1,0x09,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x6A,0xEB,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,0x33,   0,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,0x1D,0x9B,0xE3,0xF9,0xE3,0x9B,0x1E,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2730,27 +2381,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,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x42,0xA3,0xDF,0xF7,0xF1,0xCD,0x83,0x1A,   0,   0,   0,   0,
-   0,   0,   0,0x06,0xA3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF3,0x59,   0,   0,   0,
-   0,   0,   0,0xAB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFC,0x42,   0,   0,
-   0,   0,0x55,0xFF,0xFF,0xFF,0xFB,0x8C,0x4E,0x67,0xD2,0xFF,0xFF,0xFF,0xD0,   0,   0,
-   0,   0,0xC7,0xFF,0xFF,0xFF,0x67,   0,   0,   0,0x06,0xD3,0xFF,0xFF,0xFF,0x25,   0,
-   0,0x11,0xFE,0xFF,0xFF,0xEE,0x07,   0,   0,   0,   0,0x78,0xFF,0xFF,0xFF,0x48,   0,
-   0,0x3F,0xFF,0xFF,0xFF,0xB4,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x52,0xFF,0xFF,0xFF,0x9E,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x52,0xFF,0xFF,0xFF,0x9E,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x3F,0xFF,0xFF,0xFF,0xB2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x12,0xFE,0xFF,0xFF,0xE9,0x04,   0,   0,   0,   0,0x42,0x93,0x93,0x93,0x2C,   0,
-   0,   0,0xC8,0xFF,0xFF,0xFF,0x59,   0,   0,   0,0x01,0xB6,0xFF,0xFF,0xFF,0x32,   0,
-   0,   0,0x55,0xFF,0xFF,0xFF,0xF5,0x78,0x3D,0x51,0xB6,0xFF,0xFF,0xFF,0xDC,0x01,   0,
-   0,   0,   0,0xAA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFC,0x46,   0,   0,
-   0,   0,   0,0x06,0xA3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,0x53,   0,   0,   0,
-   0,   0,   0,   0,   0,0x40,0xA3,0xE0,0xF7,0xF2,0xCC,0x7F,0x16,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x3F,0x9C,0xD8,0xF1,0xF7,0xDE,0xC2,0x88,0x33,   0,   0,
+   0,   0,   0,   0,0x0F,0xB2,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,   0,0x08,0xCD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,   0,0x8A,0xFF,0xFF,0xFF,0xFF,0xA0,0x2F,0x07,0x0B,0x2C,0x70,0xCF,0x07,   0,
+   0,   0,0x0F,0xF4,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x50,0xFF,0xFF,0xFF,0xF4,0x0D,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x82,0xFF,0xFF,0xFF,0xB9,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x97,0xFF,0xFF,0xFF,0x9B,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x97,0xFF,0xFF,0xFF,0x9A,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x83,0xFF,0xFF,0xFF,0xB7,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x52,0xFF,0xFF,0xFF,0xF2,0x0B,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x11,0xF6,0xFF,0xFF,0xFF,0x8A,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x8F,0xFF,0xFF,0xFF,0xFF,0x9B,0x2D,0x06,0x13,0x30,0x6B,0xCC,0x07,   0,
+   0,   0,   0,0x0A,0xD2,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,   0,   0,0x13,0xBA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,   0,   0,   0,   0,0x45,0xA0,0xDB,0xF3,0xF7,0xE0,0xC5,0x83,0x2E,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2764,33 +2410,28 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xA7,0xFF,0xFF,0xFF,0x4B,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xA7,0xFF,0xFF,0xFF,0x4B,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xA7,0xFF,0xFF,0xFF,0x4B,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xA7,0xFF,0xFF,0xFF,0x4B,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xA7,0xFF,0xFF,0xFF,0x4B,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xA7,0xFF,0xFF,0xFF,0x4B,   0,
-   0,   0,   0,   0,0x1B,0x94,0xDF,0xF8,0xE7,0x9F,0x1F,0xA7,0xFF,0xFF,0xFF,0x4B,   0,
-   0,   0,   0,0x3A,0xF0,0xFF,0xFF,0xFF,0xFF,0xFF,0xEE,0xD1,0xFF,0xFF,0xFF,0x4B,   0,
-   0,   0,0x15,0xED,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x4B,   0,
-   0,   0,0x91,0xFF,0xFF,0xFF,0xF8,0x85,0x50,0x6C,0xDB,0xFF,0xFF,0xFF,0xFF,0x4B,   0,
-   0,0x04,0xED,0xFF,0xFF,0xFF,0x5A,   0,   0,   0,0x12,0xE4,0xFF,0xFF,0xFF,0x4B,   0,
-   0,0x2D,0xFF,0xFF,0xFF,0xE6,0x03,   0,   0,   0,   0,0xA7,0xFF,0xFF,0xFF,0x4B,   0,
-   0,0x52,0xFF,0xFF,0xFF,0xA6,   0,   0,   0,   0,   0,0xA7,0xFF,0xFF,0xFF,0x4B,   0,
-   0,0x62,0xFF,0xFF,0xFF,0x8D,   0,   0,   0,   0,   0,0xA7,0xFF,0xFF,0xFF,0x4B,   0,
-   0,0x63,0xFF,0xFF,0xFF,0x8A,   0,   0,   0,   0,   0,0xA7,0xFF,0xFF,0xFF,0x4B,   0,
-   0,0x52,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,0xA7,0xFF,0xFF,0xFF,0x4B,   0,
-   0,0x2A,0xFF,0xFF,0xFF,0xDC,0x01,   0,   0,   0,   0,0xA7,0xFF,0xFF,0xFF,0x4B,   0,
-   0,0x02,0xE9,0xFF,0xFF,0xFF,0x4E,   0,   0,   0,0x0F,0xE0,0xFF,0xFF,0xFF,0x4B,   0,
-   0,   0,0x89,0xFF,0xFF,0xFF,0xF3,0x77,0x47,0x65,0xD8,0xFF,0xFF,0xFF,0xFF,0x4B,   0,
-   0,   0,0x11,0xE8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x4B,   0,
-   0,   0,   0,0x34,0xEC,0xFF,0xFF,0xFF,0xFF,0xFF,0xF7,0xB3,0xFF,0xFF,0xFF,0x4B,   0,
-   0,   0,   0,   0,0x18,0x92,0xDF,0xF9,0xE8,0xA6,0x29,0x51,0xFF,0xFF,0xFF,0x4B,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xCC,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xCC,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xCC,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xCC,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xCC,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xCC,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,   0,   0,0x5D,0xC1,0xEF,0xF4,0xC6,0x55,   0,0xCC,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,0x02,0xA5,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x88,0xCC,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,0x72,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF7,0xFF,0xFF,0xFF,0x54,   0,
+   0,0x06,0xEE,0xFF,0xFF,0xFF,0xD0,0x2D,0x0A,0x62,0xFA,0xFF,0xFF,0xFF,0xFF,0x54,   0,
+   0,0x4B,0xFF,0xFF,0xFF,0xFB,0x23,   0,   0,   0,0x83,0xFF,0xFF,0xFF,0xFF,0x54,   0,
+   0,0x81,0xFF,0xFF,0xFF,0xBA,   0,   0,   0,   0,0x1D,0xFF,0xFF,0xFF,0xFF,0x54,   0,
+   0,0xA3,0xFF,0xFF,0xFF,0x86,   0,   0,   0,   0,   0,0xE8,0xFF,0xFF,0xFF,0x54,   0,
+   0,0xB1,0xFF,0xFF,0xFF,0x71,   0,   0,   0,   0,   0,0xD2,0xFF,0xFF,0xFF,0x54,   0,
+   0,0xB2,0xFF,0xFF,0xFF,0x70,   0,   0,   0,   0,   0,0xD2,0xFF,0xFF,0xFF,0x54,   0,
+   0,0xA3,0xFF,0xFF,0xFF,0x86,   0,   0,   0,   0,   0,0xE8,0xFF,0xFF,0xFF,0x54,   0,
+   0,0x80,0xFF,0xFF,0xFF,0xBA,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0xFF,0x54,   0,
+   0,0x4A,0xFF,0xFF,0xFF,0xFB,0x23,   0,   0,   0,0x83,0xFF,0xFF,0xFF,0xFF,0x54,   0,
+   0,0x06,0xEE,0xFF,0xFF,0xFF,0xCF,0x2C,0x09,0x61,0xFA,0xFF,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,0x73,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF4,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,0x02,0xAA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x87,0xCC,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,   0,0x01,0x64,0xC9,0xF3,0xF2,0xC5,0x57,   0,0xCC,0xFF,0xFF,0xFF,0x54,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2810,27 +2451,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,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x23,0x8D,0xD5,0xF3,0xF4,0xDA,0x98,0x2D,   0,   0,   0,   0,
-   0,   0,   0,   0,0x78,0xF9,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFD,0x83,0x01,   0,   0,
-   0,   0,   0,0x84,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7B,   0,   0,
-   0,   0,0x3D,0xFE,0xFF,0xFF,0xFE,0xA1,0x57,0x59,0x9C,0xFD,0xFF,0xFF,0xFB,0x1F,   0,
-   0,   0,0xBB,0xFF,0xFF,0xFF,0x74,   0,   0,   0,   0,0x68,0xFF,0xFF,0xFF,0x85,   0,
-   0,0x12,0xFD,0xFF,0xFF,0xE4,0x02,   0,   0,   0,   0,0x05,0xF6,0xFF,0xFF,0xC6,   0,
-   0,0x47,0xFF,0xFF,0xFF,0xF1,0xCF,0xCF,0xCF,0xCF,0xCF,0xCF,0xFA,0xFF,0xFF,0xE6,   0,
-   0,0x5E,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF6,   0,
-   0,0x65,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF7,   0,
-   0,0x52,0xFF,0xFF,0xFF,0xB4,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x23,0xFF,0xFF,0xFF,0xF8,0x19,   0,   0,   0,   0,   0,   0,0x01,   0,   0,   0,
-   0,   0,0xCF,0xFF,0xFF,0xFF,0xBD,0x09,   0,   0,   0,   0,0x15,0xC4,0x39,   0,   0,
-   0,   0,0x4A,0xFF,0xFF,0xFF,0xFF,0xDC,0x63,0x3A,0x4A,0x89,0xEE,0xFF,0xEB,0x25,   0,
-   0,   0,   0,0x85,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFD,0x54,   0,
-   0,   0,   0,   0,0x6D,0xF5,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE8,0x4F,   0,   0,
-   0,   0,   0,   0,   0,0x18,0x80,0xC8,0xEB,0xF9,0xE3,0xC0,0x6A,0x0F,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x01,0x55,0xAC,0xE2,0xF8,0xF1,0xD5,0x94,0x2C,   0,   0,   0,   0,
+   0,   0,   0,0x1A,0xC8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFD,0x83,   0,   0,   0,
+   0,   0,0x10,0xDD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x83,   0,   0,
+   0,   0,0x9F,0xFF,0xFF,0xFF,0xEC,0x53,0x0A,0x13,0x6B,0xF9,0xFF,0xFF,0xFD,0x30,   0,
+   0,0x1B,0xFB,0xFF,0xFF,0xFF,0x52,   0,   0,   0,   0,0x83,0xFF,0xFF,0xFF,0xA0,   0,
+   0,0x64,0xFF,0xFF,0xFF,0xDE,   0,   0,   0,   0,   0,0x1D,0xFF,0xFF,0xFF,0xEB,   0,
+   0,0x96,0xFF,0xFF,0xFF,0xA9,   0,   0,   0,   0,   0,0x01,0xF7,0xFF,0xFF,0xFF,0x1F,
+   0,0xAA,0xFF,0xFF,0xFF,0xFE,0xFC,0xFC,0xFD,0xFE,0xFE,0xFF,0xFF,0xFF,0xFF,0xFF,0x34,
+   0,0xAB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x42,
+   0,0x99,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x44,
+   0,0x6B,0xFF,0xFF,0xFF,0x93,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x24,0xFE,0xFF,0xFF,0xE2,0x0D,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xAC,0xFF,0xFF,0xFF,0xD2,0x56,0x19,0x04,0x0C,0x22,0x39,0x68,0xA9,0x8D,   0,
+   0,   0,0x17,0xE2,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x9C,   0,
+   0,   0,   0,0x1D,0xC5,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x9C,   0,
+   0,   0,   0,   0,   0,0x46,0x9D,0xD6,0xEF,0xFB,0xEC,0xD8,0xC0,0x89,0x48,0x0C,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2844,33 +2480,28 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x12,0x74,0xBD,0xEA,0xFB,0xF7,0xDF,0xB8,0x32,
-   0,   0,   0,   0,   0,   0,   0,0x43,0xEA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x41,
-   0,   0,   0,   0,   0,   0,0x29,0xF4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x2C,
-   0,   0,   0,   0,   0,   0,0xAC,0xFF,0xFF,0xFF,0xF6,0x92,0x5A,0x51,0x5F,0x7D,0x10,
-   0,   0,   0,   0,   0,0x07,0xF6,0xFF,0xFF,0xFF,0x46,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x22,0xFF,0xFF,0xFF,0xDA,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x2F,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x37,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x47,   0,
-   0,0x37,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x47,   0,
-   0,0x37,0xFB,0xFB,0xFB,0xFC,0xFF,0xFF,0xFF,0xFE,0xFB,0xFB,0xFB,0xFB,0xFB,0x46,   0,
-   0,   0,   0,   0,   0,0x2F,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x2F,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x2F,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x2F,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x2F,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x2F,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x2F,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x2F,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x2F,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x2F,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x2F,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x2F,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x2F,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x0D,0x7D,0xC7,0xEC,0xFA,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,   0,   0,   0,   0,0x06,0xCF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,   0,   0,   0,   0,0x58,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,   0,   0,   0,   0,0x94,0xFF,0xFF,0xFF,0xC5,0x16,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xAA,0xFF,0xFF,0xFF,0x7E,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xB0,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,   0,   0,   0,   0,0xB0,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xB0,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xB0,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xB0,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xB0,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xB0,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xB0,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xB0,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xB0,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xB0,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xB0,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xB0,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xB0,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2890,33 +2521,28 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x0F,0x83,0xD6,0xF6,0xED,0xC1,0x59,0x21,0xFF,0xFF,0xFF,0x7F,   0,
-   0,   0,   0,0x28,0xE4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC3,0xFF,0xFF,0xFF,0x7F,   0,
-   0,   0,0x0B,0xE0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7F,   0,
-   0,   0,0x7F,0xFF,0xFF,0xFF,0xFE,0x9B,0x52,0x5F,0xBB,0xFF,0xFF,0xFF,0xFF,0x7F,   0,
-   0,   0,0xE3,0xFF,0xFF,0xFF,0x7C,   0,   0,   0,0x01,0xAD,0xFF,0xFF,0xFF,0x7F,   0,
-   0,0x25,0xFF,0xFF,0xFF,0xF2,0x0D,   0,   0,   0,   0,0x6F,0xFF,0xFF,0xFF,0x7F,   0,
-   0,0x50,0xFF,0xFF,0xFF,0xB5,   0,   0,   0,   0,   0,0x6F,0xFF,0xFF,0xFF,0x7F,   0,
-   0,0x61,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,0x6F,0xFF,0xFF,0xFF,0x7F,   0,
-   0,0x62,0xFF,0xFF,0xFF,0x94,   0,   0,   0,   0,   0,0x6F,0xFF,0xFF,0xFF,0x7F,   0,
-   0,0x51,0xFF,0xFF,0xFF,0xAE,   0,   0,   0,   0,   0,0x6F,0xFF,0xFF,0xFF,0x7F,   0,
-   0,0x25,0xFF,0xFF,0xFF,0xEA,0x07,   0,   0,   0,   0,0x6F,0xFF,0xFF,0xFF,0x7F,   0,
-   0,   0,0xE2,0xFF,0xFF,0xFF,0x6C,   0,   0,   0,   0,0xA6,0xFF,0xFF,0xFF,0x7F,   0,
-   0,   0,0x7B,0xFF,0xFF,0xFF,0xFB,0x8C,0x48,0x55,0xB1,0xFF,0xFF,0xFF,0xFF,0x7F,   0,
-   0,   0,0x09,0xDC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7F,   0,
-   0,   0,   0,0x24,0xDF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0xCC,0xFF,0xFF,0xFF,0x7F,   0,
-   0,   0,   0,   0,0x0D,0x80,0xD6,0xF7,0xEB,0xB4,0x41,0x7A,0xFF,0xFF,0xFF,0x79,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xA4,0xFF,0xFF,0xFF,0x63,   0,
-   0,   0,   0,0x1E,0xAF,0x0C,   0,   0,   0,   0,0x22,0xF7,0xFF,0xFF,0xFF,0x27,   0,
-   0,   0,0x02,0xC1,0xFF,0xE2,0x70,0x36,0x3A,0x6F,0xEC,0xFF,0xFF,0xFF,0xC4,   0,   0,
-   0,   0,0x44,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF4,0x2F,   0,   0,
-   0,   0,   0,0x6E,0xF5,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE4,0x3D,   0,   0,   0,
-   0,   0,   0,   0,0x18,0x7E,0xC8,0xEE,0xFA,0xE8,0xB9,0x6B,0x0B,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x36,0xAD,0xE9,0xF7,0xD9,0x86,0x0D,0xA0,0xFF,0xFF,0xFF,0x84,   0,
+   0,   0,   0,0x60,0xFC,0xFF,0xFF,0xFF,0xFF,0xFF,0xD8,0xB2,0xFF,0xFF,0xFF,0x84,   0,
+   0,   0,0x33,0xFB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x84,   0,
+   0,   0,0xBC,0xFF,0xFF,0xFF,0xE6,0x40,0x09,0x4F,0xF2,0xFF,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x1C,0xFE,0xFF,0xFF,0xFF,0x4C,   0,   0,   0,0x6A,0xFF,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x59,0xFF,0xFF,0xFF,0xE3,0x02,   0,   0,   0,0x0D,0xF4,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x82,0xFF,0xFF,0xFF,0xAC,   0,   0,   0,   0,   0,0xC7,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x93,0xFF,0xFF,0xFF,0x94,   0,   0,   0,   0,   0,0xAD,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x96,0xFF,0xFF,0xFF,0x93,   0,   0,   0,   0,   0,0xAD,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x88,0xFF,0xFF,0xFF,0xAC,   0,   0,   0,   0,   0,0xC6,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x63,0xFF,0xFF,0xFF,0xE3,0x02,   0,   0,   0,0x0C,0xF4,0xFF,0xFF,0xFF,0x84,   0,
+   0,0x28,0xFF,0xFF,0xFF,0xFF,0x4C,   0,   0,   0,0x68,0xFF,0xFF,0xFF,0xFF,0x84,   0,
+   0,   0,0xCB,0xFF,0xFF,0xFF,0xE5,0x3F,0x08,0x4E,0xF1,0xFF,0xFF,0xFF,0xFF,0x84,   0,
+   0,   0,0x41,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x84,   0,
+   0,   0,   0,0x70,0xFE,0xFF,0xFF,0xFF,0xFF,0xFF,0xDD,0xB2,0xFF,0xFF,0xFF,0x84,   0,
+   0,   0,   0,   0,0x3C,0xB1,0xEB,0xF9,0xDF,0x92,0x12,0xA4,0xFF,0xFF,0xFF,0x7D,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xC2,0xFF,0xFF,0xFF,0x6B,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x1F,0xF6,0xFF,0xFF,0xFF,0x3F,   0,
+   0,   0,   0,0xC7,0x7B,0x3E,0x22,0x0A,0x13,0x47,0xD3,0xFF,0xFF,0xFF,0xED,0x09,   0,
+   0,   0,   0,0xF4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x76,   0,   0,
+   0,   0,   0,0xF4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x93,0x01,   0,   0,
+   0,   0,   0,0x28,0x7B,0xB9,0xD8,0xEF,0xFB,0xEE,0xCD,0x94,0x34,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
 // 'h'
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2924,33 +2550,28 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xFF,0xFF,0xFF,0xEF,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xFF,0xFF,0xFF,0xEF,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xFF,0xFF,0xFF,0xEF,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xFF,0xFF,0xFF,0xEF,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xFF,0xFF,0xFF,0xEF,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xFF,0xFF,0xFF,0xEF,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xFF,0xFF,0xFF,0xEF,   0,0x26,0xA2,0xE0,0xF8,0xDD,0x93,0x1D,   0,   0,   0,
-   0,   0,0xFF,0xFF,0xFF,0xEF,0x48,0xF7,0xFF,0xFF,0xFF,0xFF,0xFF,0xEB,0x2E,   0,   0,
-   0,   0,0xFF,0xFF,0xFF,0xF9,0xF1,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD3,0x01,   0,
-   0,   0,0xFF,0xFF,0xFF,0xFF,0xF3,0x8B,0x57,0x66,0xBE,0xFF,0xFF,0xFF,0xFF,0x45,   0,
-   0,   0,0xFF,0xFF,0xFF,0xFA,0x2B,   0,   0,   0,   0,0xBB,0xFF,0xFF,0xFF,0x86,   0,
-   0,   0,0xFF,0xFF,0xFF,0xEF,   0,   0,   0,   0,   0,0x5A,0xFF,0xFF,0xFF,0xA7,   0,
-   0,   0,0xFF,0xFF,0xFF,0xEF,   0,   0,   0,   0,   0,0x3B,0xFF,0xFF,0xFF,0xB6,   0,
-   0,   0,0xFF,0xFF,0xFF,0xEF,   0,   0,   0,   0,   0,0x37,0xFF,0xFF,0xFF,0xB7,   0,
-   0,   0,0xFF,0xFF,0xFF,0xEF,   0,   0,   0,   0,   0,0x37,0xFF,0xFF,0xFF,0xB7,   0,
-   0,   0,0xFF,0xFF,0xFF,0xEF,   0,   0,   0,   0,   0,0x37,0xFF,0xFF,0xFF,0xB7,   0,
-   0,   0,0xFF,0xFF,0xFF,0xEF,   0,   0,   0,   0,   0,0x37,0xFF,0xFF,0xFF,0xB7,   0,
-   0,   0,0xFF,0xFF,0xFF,0xEF,   0,   0,   0,   0,   0,0x37,0xFF,0xFF,0xFF,0xB7,   0,
-   0,   0,0xFF,0xFF,0xFF,0xEF,   0,   0,   0,   0,   0,0x37,0xFF,0xFF,0xFF,0xB7,   0,
-   0,   0,0xFF,0xFF,0xFF,0xEF,   0,   0,   0,   0,   0,0x37,0xFF,0xFF,0xFF,0xB7,   0,
-   0,   0,0xFF,0xFF,0xFF,0xEF,   0,   0,   0,   0,   0,0x37,0xFF,0xFF,0xFF,0xB7,   0,
-   0,   0,0xFF,0xFF,0xFF,0xEF,   0,   0,   0,   0,   0,0x37,0xFF,0xFF,0xFF,0xB7,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,0x0E,0x89,0xDC,0xF8,0xE9,0xA6,0x23,   0,   0,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x97,0xD0,0xFF,0xFF,0xFF,0xFF,0xFF,0xEB,0x1F,   0,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0xF2,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA1,   0,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0xFF,0xA6,0x15,0x1B,0xB5,0xFF,0xFF,0xFF,0xF1,0x01,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0xF3,0x0C,   0,   0,0x2C,0xFF,0xFF,0xFF,0xFF,0x1A,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0xB2,   0,   0,   0,0x04,0xFE,0xFF,0xFF,0xFF,0x29,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x98,   0,   0,   0,   0,0xF4,0xFF,0xFF,0xFF,0x2C,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,0xF4,0xFF,0xFF,0xFF,0x2C,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,0xF4,0xFF,0xFF,0xFF,0x2C,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,0xF4,0xFF,0xFF,0xFF,0x2C,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,0xF4,0xFF,0xFF,0xFF,0x2C,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,0xF4,0xFF,0xFF,0xFF,0x2C,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,0xF4,0xFF,0xFF,0xFF,0x2C,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,0xF4,0xFF,0xFF,0xFF,0x2C,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,0xF4,0xFF,0xFF,0xFF,0x2C,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,0xF4,0xFF,0xFF,0xFF,0x2C,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -2962,35 +2583,30 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x58,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x58,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x58,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x58,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x58,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x2C,0xCA,0xF4,0xB6,0x12,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0xBC,0xFF,0xFF,0xFF,0x87,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0xCF,0xFF,0xFF,0xFF,0x9A,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x5E,0xFC,0xFF,0xF2,0x35,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x21,0x45,0x15,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0xF3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,0xF3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,0xF3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,0x48,0x4B,0x4B,0x4B,0xB6,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,0x44,0x47,0x47,0x47,0xB5,0xFF,0xFF,0xFF,0x8F,0x47,0x47,0x47,0x26,   0,
-   0,   0,   0,0xF3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x87,   0,
-   0,   0,   0,0xF3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x87,   0,
-   0,   0,   0,0xF3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x87,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xE0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x58,   0,   0,   0,   0,   0,
+   0,   0,   0,0xE0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x58,   0,   0,   0,   0,   0,
+   0,   0,   0,0xE0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x58,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x58,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x58,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x58,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x58,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x58,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x58,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x58,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x58,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x58,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xD0,0xFF,0xFF,0xFF,0x58,   0,   0,   0,   0,   0,
+   0,   0,0xF8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x80,
+   0,   0,0xF8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x80,
+   0,   0,0xF8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x80,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -3002,41 +2618,36 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0xFF,0x08,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0xFF,0x08,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0xFF,0x08,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0xFF,0x08,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0xFF,0x08,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x4A,0xDE,0xF1,0x9B,0x02,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xEB,0xFF,0xFF,0xFF,0x54,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x04,0xFA,0xFF,0xFF,0xFF,0x67,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x8B,0xFF,0xFF,0xE1,0x15,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x2E,0x42,0x0B,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0xA7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x2F,   0,   0,   0,   0,
-   0,   0,   0,   0,0xA7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x2F,   0,   0,   0,   0,
-   0,   0,   0,   0,0xA7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x2F,   0,   0,   0,   0,
-   0,   0,   0,   0,0x31,0x4B,0x4B,0x4B,0xD8,0xFF,0xFF,0xFF,0x2F,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xC7,0xFF,0xFF,0xFF,0x2F,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xC7,0xFF,0xFF,0xFF,0x2F,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xC7,0xFF,0xFF,0xFF,0x2F,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xC7,0xFF,0xFF,0xFF,0x2F,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xC7,0xFF,0xFF,0xFF,0x2F,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xC7,0xFF,0xFF,0xFF,0x2F,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xC7,0xFF,0xFF,0xFF,0x2F,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xC7,0xFF,0xFF,0xFF,0x2F,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xC7,0xFF,0xFF,0xFF,0x2F,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xC7,0xFF,0xFF,0xFF,0x2F,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xC7,0xFF,0xFF,0xFF,0x2F,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xC7,0xFF,0xFF,0xFF,0x2F,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xDC,0xFF,0xFF,0xFF,0x26,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x2B,0xFE,0xFF,0xFF,0xFE,0x0E,   0,   0,   0,   0,
-   0,   0,   0,0x41,0x55,0x57,0x7B,0xE6,0xFF,0xFF,0xFF,0xCB,   0,   0,   0,   0,   0,
-   0,   0,   0,0xB3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,
-   0,   0,   0,0xC3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0x7E,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0xB7,0xF8,0xFF,0xF4,0xD7,0x9C,0x35,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x50,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x08,   0,   0,   0,   0,
+   0,   0,   0,0x50,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x08,   0,   0,   0,   0,
+   0,   0,   0,0x50,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x08,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0xFF,0x08,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0xFF,0x08,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0xFF,0x08,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0xFF,0x08,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0xFF,0x08,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0xFF,0x08,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0xFF,0x08,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0xFF,0x08,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0xFF,0x08,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0xFF,0x08,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0xFF,0x08,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0xFF,0x08,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x1D,0xFF,0xFF,0xFF,0xFF,0x05,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x2D,0xFF,0xFF,0xFF,0xFA,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x61,0xFF,0xFF,0xFF,0xE0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x09,0x42,0xE3,0xFF,0xFF,0xFF,0xAE,   0,   0,   0,   0,   0,
+   0,   0,0xF8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x53,   0,   0,   0,   0,   0,
+   0,   0,0xF8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xAE,   0,   0,   0,   0,   0,   0,
+   0,   0,0xF8,0xFF,0xFF,0xFF,0xFE,0xEE,0xC2,0x67,0x03,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
 // 'k'
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -3044,33 +2655,28 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xF7,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xF7,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xF7,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xF7,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xF7,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xF7,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xF7,   0,   0,   0,   0,0x1F,0xE7,0xFF,0xFF,0xFF,0xAF,0x02,
-   0,   0,0xF3,0xFF,0xFF,0xF7,   0,   0,   0,0x0F,0xD4,0xFF,0xFF,0xFF,0xCA,0x0A,   0,
-   0,   0,0xF3,0xFF,0xFF,0xF7,   0,   0,0x05,0xBC,0xFF,0xFF,0xFF,0xE0,0x17,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xF7,   0,   0,0x9E,0xFF,0xFF,0xFF,0xF0,0x2A,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xF7,   0,0x7D,0xFF,0xFF,0xFF,0xFA,0x43,   0,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xF7,0x58,0xFF,0xFF,0xFF,0xFF,0x62,   0,   0,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFD,0xF7,0xFF,0xFF,0xFF,0x96,   0,   0,   0,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xDB,0x0C,   0,   0,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x9D,   0,   0,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFF,0xFF,0xC6,0xFD,0xFF,0xFF,0xFF,0x53,   0,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFF,0xA5,0x04,0x8F,0xFF,0xFF,0xFF,0xED,0x1B,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xF9,0x01,   0,0x09,0xDA,0xFF,0xFF,0xFF,0xBC,0x01,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xF7,   0,   0,   0,0x3C,0xFD,0xFF,0xFF,0xFF,0x73,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xF7,   0,   0,   0,   0,0x8F,0xFF,0xFF,0xFF,0xF9,0x30,   0,
-   0,   0,0xF3,0xFF,0xFF,0xF7,   0,   0,   0,   0,0x09,0xDA,0xFF,0xFF,0xFF,0xD5,0x09,
-   0,   0,0xF3,0xFF,0xFF,0xF7,   0,   0,   0,   0,   0,0x3C,0xFD,0xFF,0xFF,0xFF,0x94,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0x9C,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0x9C,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0x9C,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0x9C,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0x9C,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0x9C,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0x9C,   0,   0,   0,0x0E,0xCF,0xFF,0xFF,0xFF,0xED,0x31,
+   0,   0,0x88,0xFF,0xFF,0xFF,0x9C,   0,   0,0x07,0xBF,0xFF,0xFF,0xFF,0xED,0x30,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0x9C,   0,0x03,0xAF,0xFF,0xFF,0xFF,0xEC,0x30,   0,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0x9C,   0,0x9C,0xFF,0xFF,0xFF,0xEC,0x2F,   0,   0,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0x9C,0x88,0xFF,0xFF,0xFF,0xEB,0x2E,   0,   0,   0,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0xE9,0xFF,0xFF,0xFF,0xEB,0x2D,   0,   0,   0,   0,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE6,0x0F,   0,   0,   0,   0,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0xFF,0xE4,0xEB,0xFF,0xFF,0xFE,0x3B,   0,   0,   0,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0xE2,0x22,0x66,0xFF,0xFF,0xFF,0xD5,0x06,   0,   0,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0x9C,   0,0x02,0xCE,0xFF,0xFF,0xFF,0x7D,   0,   0,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0x9C,   0,   0,0x3D,0xFF,0xFF,0xFF,0xF8,0x26,   0,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0x9C,   0,   0,   0,0xA8,0xFF,0xFF,0xFF,0xBF,   0,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0x9C,   0,   0,   0,0x1D,0xF6,0xFF,0xFF,0xFF,0x63,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0x9C,   0,   0,   0,   0,0x7F,0xFF,0xFF,0xFF,0xEE,0x16,
+   0,   0,0x88,0xFF,0xFF,0xFF,0x9C,   0,   0,   0,   0,0x09,0xE1,0xFF,0xFF,0xFF,0xA7,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -3084,33 +2690,28 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x2F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,0x2F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,0x2F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,0x0E,0x4B,0x4B,0x4B,0x4B,0xB6,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x97,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,
-   0,   0,0x0D,0x47,0x47,0x47,0x47,0xB5,0xFF,0xFF,0xFF,0x8F,0x47,0x47,0x47,0x38,   0,
-   0,   0,0x2F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC7,   0,
-   0,   0,0x2F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC7,   0,
-   0,   0,0x2F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC7,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0xB8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,   0,
+   0,0xB8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,   0,
+   0,0xB8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x84,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x84,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x84,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x84,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x84,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x84,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x84,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x84,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x84,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x84,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x84,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x84,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x82,0xFF,0xFF,0xFF,0xA1,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x78,0xFF,0xFF,0xFF,0xAF,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x5F,0xFF,0xFF,0xFF,0xE1,0x01,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x2C,0xFF,0xFF,0xFF,0xFF,0x95,0x1C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0xD2,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7C,   0,
+   0,   0,   0,   0,   0,   0,0x38,0xF3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7C,   0,
+   0,   0,   0,   0,   0,   0,   0,0x25,0x9A,0xDC,0xF7,0xFF,0xFF,0xFF,0xFF,0x7C,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -3130,27 +2731,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,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0xEF,0xFF,0xFF,0x7A,0x3E,0xC8,0xF6,0xDF,0x5C,0x25,0xB5,0xF2,0xEB,0x8B,0x03,   0,
-   0,0xEF,0xFF,0xFF,0xB4,0xF8,0xFF,0xFF,0xFF,0xF9,0xE6,0xFF,0xFF,0xFF,0xFF,0x7F,   0,
-   0,0xEF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE7,   0,
-   0,0xEF,0xFF,0xFF,0xE3,0x29,0x72,0xFF,0xFF,0xFF,0x9E,0x1B,0xB3,0xFF,0xFF,0xFF,0x1C,
-   0,0xEF,0xFF,0xFF,0xA4,   0,0x21,0xFF,0xFF,0xFF,0x5B,   0,0x69,0xFF,0xFF,0xFF,0x2F,
-   0,0xEF,0xFF,0xFF,0xA3,   0,0x1B,0xFF,0xFF,0xFF,0x5B,   0,0x63,0xFF,0xFF,0xFF,0x33,
-   0,0xEF,0xFF,0xFF,0xA3,   0,0x1B,0xFF,0xFF,0xFF,0x5B,   0,0x63,0xFF,0xFF,0xFF,0x33,
-   0,0xEF,0xFF,0xFF,0xA3,   0,0x1B,0xFF,0xFF,0xFF,0x5B,   0,0x63,0xFF,0xFF,0xFF,0x33,
-   0,0xEF,0xFF,0xFF,0xA3,   0,0x1B,0xFF,0xFF,0xFF,0x5B,   0,0x63,0xFF,0xFF,0xFF,0x33,
-   0,0xEF,0xFF,0xFF,0xA3,   0,0x1B,0xFF,0xFF,0xFF,0x5B,   0,0x63,0xFF,0xFF,0xFF,0x33,
-   0,0xEF,0xFF,0xFF,0xA3,   0,0x1B,0xFF,0xFF,0xFF,0x5B,   0,0x63,0xFF,0xFF,0xFF,0x33,
-   0,0xEF,0xFF,0xFF,0xA3,   0,0x1B,0xFF,0xFF,0xFF,0x5B,   0,0x63,0xFF,0xFF,0xFF,0x33,
-   0,0xEF,0xFF,0xFF,0xA3,   0,0x1B,0xFF,0xFF,0xFF,0x5B,   0,0x63,0xFF,0xFF,0xFF,0x33,
-   0,0xEF,0xFF,0xFF,0xA3,   0,0x1B,0xFF,0xFF,0xFF,0x5B,   0,0x63,0xFF,0xFF,0xFF,0x33,
-   0,0xEF,0xFF,0xFF,0xA3,   0,0x1B,0xFF,0xFF,0xFF,0x5B,   0,0x63,0xFF,0xFF,0xFF,0x33,
-   0,0xEF,0xFF,0xFF,0xA3,   0,0x1B,0xFF,0xFF,0xFF,0x5B,   0,0x63,0xFF,0xFF,0xFF,0x33,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0xD8,0xFF,0xFF,0x35,0x95,0xEC,0xEF,0x9D,0x0D,0x38,0xC6,0xF7,0xE9,0x96,0x0A,   0,
+   0,0xD8,0xFF,0xFF,0xCC,0xFF,0xFF,0xFF,0xFF,0xB9,0xF1,0xFF,0xFF,0xFF,0xFF,0x93,   0,
+   0,0xD8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,0x01,
+   0,0xD8,0xFF,0xFF,0xE2,0x1B,0x5D,0xFF,0xFF,0xFF,0xD1,0x14,0x76,0xFF,0xFF,0xFF,0x24,
+   0,0xD8,0xFF,0xFF,0xA2,   0,0x04,0xFC,0xFF,0xFF,0x83,   0,0x1F,0xFF,0xFF,0xFF,0x3F,
+   0,0xD8,0xFF,0xFF,0x92,   0,   0,0xEE,0xFF,0xFF,0x72,   0,0x0E,0xFF,0xFF,0xFF,0x50,
+   0,0xD8,0xFF,0xFF,0x90,   0,   0,0xEC,0xFF,0xFF,0x70,   0,0x0C,0xFF,0xFF,0xFF,0x57,
+   0,0xD8,0xFF,0xFF,0x90,   0,   0,0xEC,0xFF,0xFF,0x70,   0,0x0C,0xFF,0xFF,0xFF,0x5B,
+   0,0xD8,0xFF,0xFF,0x90,   0,   0,0xEC,0xFF,0xFF,0x70,   0,0x0C,0xFF,0xFF,0xFF,0x5C,
+   0,0xD8,0xFF,0xFF,0x90,   0,   0,0xEC,0xFF,0xFF,0x70,   0,0x0C,0xFF,0xFF,0xFF,0x5C,
+   0,0xD8,0xFF,0xFF,0x90,   0,   0,0xEC,0xFF,0xFF,0x70,   0,0x0C,0xFF,0xFF,0xFF,0x5C,
+   0,0xD8,0xFF,0xFF,0x90,   0,   0,0xEC,0xFF,0xFF,0x70,   0,0x0C,0xFF,0xFF,0xFF,0x5C,
+   0,0xD8,0xFF,0xFF,0x90,   0,   0,0xEC,0xFF,0xFF,0x70,   0,0x0C,0xFF,0xFF,0xFF,0x5C,
+   0,0xD8,0xFF,0xFF,0x90,   0,   0,0xEC,0xFF,0xFF,0x70,   0,0x0C,0xFF,0xFF,0xFF,0x5C,
+   0,0xD8,0xFF,0xFF,0x90,   0,   0,0xEC,0xFF,0xFF,0x70,   0,0x0C,0xFF,0xFF,0xFF,0x5C,
+   0,0xD8,0xFF,0xFF,0x90,   0,   0,0xEC,0xFF,0xFF,0x70,   0,0x0C,0xFF,0xFF,0xFF,0x5C,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -3170,27 +2766,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,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xFF,0xFF,0xFF,0x9D,   0,0x39,0xAA,0xDF,0xF9,0xE3,0x9F,0x27,   0,   0,   0,
-   0,   0,0xFF,0xFF,0xFF,0xBA,0x80,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF3,0x3B,   0,   0,
-   0,   0,0xFF,0xFF,0xFF,0xF9,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xDC,0x03,   0,
-   0,   0,0xFF,0xFF,0xFF,0xFF,0xE0,0x57,0x1B,0x24,0x76,0xFA,0xFF,0xFF,0xFF,0x47,   0,
-   0,   0,0xFF,0xFF,0xFF,0xFB,0x21,   0,   0,   0,   0,0x8F,0xFF,0xFF,0xFF,0x83,   0,
-   0,   0,0xFF,0xFF,0xFF,0xF3,   0,   0,   0,   0,   0,0x51,0xFF,0xFF,0xFF,0x9E,   0,
-   0,   0,0xFF,0xFF,0xFF,0xF3,   0,   0,   0,   0,   0,0x44,0xFF,0xFF,0xFF,0xAB,   0,
-   0,   0,0xFF,0xFF,0xFF,0xF3,   0,   0,   0,   0,   0,0x43,0xFF,0xFF,0xFF,0xAB,   0,
-   0,   0,0xFF,0xFF,0xFF,0xF3,   0,   0,   0,   0,   0,0x43,0xFF,0xFF,0xFF,0xAB,   0,
-   0,   0,0xFF,0xFF,0xFF,0xF3,   0,   0,   0,   0,   0,0x43,0xFF,0xFF,0xFF,0xAB,   0,
-   0,   0,0xFF,0xFF,0xFF,0xF3,   0,   0,   0,   0,   0,0x43,0xFF,0xFF,0xFF,0xAB,   0,
-   0,   0,0xFF,0xFF,0xFF,0xF3,   0,   0,   0,   0,   0,0x43,0xFF,0xFF,0xFF,0xAB,   0,
-   0,   0,0xFF,0xFF,0xFF,0xF3,   0,   0,   0,   0,   0,0x43,0xFF,0xFF,0xFF,0xAB,   0,
-   0,   0,0xFF,0xFF,0xFF,0xF3,   0,   0,   0,   0,   0,0x43,0xFF,0xFF,0xFF,0xAB,   0,
-   0,   0,0xFF,0xFF,0xFF,0xF3,   0,   0,   0,   0,   0,0x43,0xFF,0xFF,0xFF,0xAB,   0,
-   0,   0,0xFF,0xFF,0xFF,0xF3,   0,   0,   0,   0,   0,0x43,0xFF,0xFF,0xFF,0xAB,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,0x10,0x8C,0xDD,0xF8,0xE9,0xA6,0x23,   0,   0,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x99,0xD5,0xFF,0xFF,0xFF,0xFF,0xFF,0xEB,0x1E,   0,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0xF4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA0,   0,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0xFF,0xA8,0x15,0x1B,0xB5,0xFF,0xFF,0xFF,0xF0,0x01,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0xF4,0x0E,   0,   0,0x2C,0xFF,0xFF,0xFF,0xFF,0x1A,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0xB3,   0,   0,   0,0x04,0xFF,0xFF,0xFF,0xFF,0x29,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x98,   0,   0,   0,   0,0xF4,0xFF,0xFF,0xFF,0x2C,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,0xF4,0xFF,0xFF,0xFF,0x2C,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,0xF4,0xFF,0xFF,0xFF,0x2C,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,0xF4,0xFF,0xFF,0xFF,0x2C,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,0xF4,0xFF,0xFF,0xFF,0x2C,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,0xF4,0xFF,0xFF,0xFF,0x2C,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,0xF4,0xFF,0xFF,0xFF,0x2C,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,0xF4,0xFF,0xFF,0xFF,0x2C,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,0xF4,0xFF,0xFF,0xFF,0x2C,   0,
+   0,   0,0x90,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,0xF4,0xFF,0xFF,0xFF,0x2C,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -3210,27 +2801,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,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x4E,0xAB,0xE3,0xF8,0xEB,0xC6,0x76,0x0D,   0,   0,   0,   0,
-   0,   0,   0,0x0F,0xB9,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE8,0x40,   0,   0,   0,
-   0,   0,0x05,0xC8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF8,0x38,   0,   0,
-   0,   0,0x7C,0xFF,0xFF,0xFF,0xF7,0x83,0x4C,0x65,0xD7,0xFF,0xFF,0xFF,0xD9,0x03,   0,
-   0,0x07,0xEA,0xFF,0xFF,0xFF,0x4B,   0,   0,   0,0x0E,0xDE,0xFF,0xFF,0xFF,0x51,   0,
-   0,0x3F,0xFF,0xFF,0xFF,0xD1,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0xFF,0x9E,   0,
-   0,0x71,0xFF,0xFF,0xFF,0x89,   0,   0,   0,   0,   0,0x2D,0xFF,0xFF,0xFF,0xD0,   0,
-   0,0x85,0xFF,0xFF,0xFF,0x6E,   0,   0,   0,   0,   0,0x12,0xFF,0xFF,0xFF,0xE4,   0,
-   0,0x85,0xFF,0xFF,0xFF,0x6D,   0,   0,   0,   0,   0,0x11,0xFF,0xFF,0xFF,0xE4,   0,
-   0,0x71,0xFF,0xFF,0xFF,0x87,   0,   0,   0,   0,   0,0x2B,0xFF,0xFF,0xFF,0xD0,   0,
-   0,0x40,0xFF,0xFF,0xFF,0xC9,   0,   0,   0,   0,   0,0x6D,0xFF,0xFF,0xFF,0x9F,   0,
-   0,0x08,0xEC,0xFF,0xFF,0xFF,0x41,   0,   0,   0,0x09,0xD8,0xFF,0xFF,0xFF,0x54,   0,
-   0,   0,0x7F,0xFF,0xFF,0xFF,0xF1,0x73,0x3B,0x53,0xC9,0xFF,0xFF,0xFF,0xDC,0x03,   0,
-   0,   0,0x06,0xCB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFA,0x3B,   0,   0,
-   0,   0,   0,0x11,0xBC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEC,0x45,   0,   0,   0,
-   0,   0,   0,   0,   0,0x51,0xAD,0xE3,0xF9,0xED,0xC9,0x7B,0x10,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x01,0x55,0xAE,0xE4,0xF8,0xEF,0xCD,0x85,0x18,   0,   0,   0,   0,
+   0,   0,   0,0x16,0xC4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF4,0x5A,   0,   0,   0,
+   0,   0,0x0A,0xD5,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0x55,   0,   0,
+   0,   0,0x8E,0xFF,0xFF,0xFF,0xED,0x51,0x09,0x23,0xB0,0xFF,0xFF,0xFF,0xF0,0x12,   0,
+   0,0x0F,0xF4,0xFF,0xFF,0xFF,0x4D,   0,   0,   0,0x06,0xD6,0xFF,0xFF,0xFF,0x7A,   0,
+   0,0x4F,0xFF,0xFF,0xFF,0xDD,   0,   0,   0,   0,   0,0x6B,0xFF,0xFF,0xFF,0xC5,   0,
+   0,0x80,0xFF,0xFF,0xFF,0xA4,   0,   0,   0,   0,   0,0x32,0xFF,0xFF,0xFF,0xF6,   0,
+   0,0x93,0xFF,0xFF,0xFF,0x8D,   0,   0,   0,   0,   0,0x1A,0xFF,0xFF,0xFF,0xFF,0x0A,
+   0,0x94,0xFF,0xFF,0xFF,0x8D,   0,   0,   0,   0,   0,0x1B,0xFF,0xFF,0xFF,0xFF,0x0A,
+   0,0x80,0xFF,0xFF,0xFF,0xA4,   0,   0,   0,   0,   0,0x32,0xFF,0xFF,0xFF,0xF7,   0,
+   0,0x4F,0xFF,0xFF,0xFF,0xDD,   0,   0,   0,   0,   0,0x6B,0xFF,0xFF,0xFF,0xC5,   0,
+   0,0x0F,0xF4,0xFF,0xFF,0xFF,0x4B,   0,   0,   0,0x05,0xD5,0xFF,0xFF,0xFF,0x7A,   0,
+   0,   0,0x8F,0xFF,0xFF,0xFF,0xEB,0x4F,0x08,0x22,0xAE,0xFF,0xFF,0xFF,0xF1,0x12,   0,
+   0,   0,0x0B,0xD5,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0x55,   0,   0,
+   0,   0,   0,0x16,0xC5,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF5,0x5A,   0,   0,   0,
+   0,   0,   0,   0,0x01,0x56,0xB0,0xE5,0xF9,0xF0,0xCE,0x86,0x19,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -3250,33 +2836,28 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xB9,0x0F,0x85,0xD8,0xF7,0xEB,0xB9,0x4E,   0,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xE0,0xDD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x95,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x6A,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFF,0xF3,0x80,0x50,0x6A,0xDD,0xFF,0xFF,0xFF,0xEC,0x07,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFF,0x3D,   0,   0,   0,0x16,0xEB,0xFF,0xFF,0xFF,0x50,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFB,   0,   0,   0,   0,   0,0x90,0xFF,0xFF,0xFF,0x89,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFB,   0,   0,   0,   0,   0,0x50,0xFF,0xFF,0xFF,0xAF,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFB,   0,   0,   0,   0,   0,0x35,0xFF,0xFF,0xFF,0xBE,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFB,   0,   0,   0,   0,   0,0x34,0xFF,0xFF,0xFF,0xBD,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFB,   0,   0,   0,   0,   0,0x4D,0xFF,0xFF,0xFF,0xAD,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFB,   0,   0,   0,   0,   0,0x8C,0xFF,0xFF,0xFF,0x85,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFF,0x33,   0,   0,   0,0x10,0xE9,0xFF,0xFF,0xFF,0x48,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFF,0xEC,0x6E,0x3C,0x53,0xCF,0xFF,0xFF,0xFF,0xE5,0x04,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x5D,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFD,0xCD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x86,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFB,0x0A,0x7C,0xD6,0xF6,0xEC,0xB7,0x47,   0,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFB,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFB,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFB,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFB,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFB,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xF3,0xFF,0xFF,0xFB,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,0x1D,0x9A,0xE3,0xF8,0xE2,0x9A,0x1D,   0,   0,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x6A,0xEB,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,0x33,   0,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0xF3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE1,0x09,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0xFF,0xB7,0x21,0x0E,0x7D,0xFF,0xFF,0xFF,0xFF,0x6B,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0xEA,0x0C,   0,   0,   0,0xAB,0xFF,0xFF,0xFF,0xC2,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x92,   0,   0,   0,   0,0x47,0xFF,0xFF,0xFF,0xF5,0x02,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x5E,   0,   0,   0,   0,0x13,0xFF,0xFF,0xFF,0xFF,0x1A,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x49,   0,   0,   0,   0,   0,0xFD,0xFF,0xFF,0xFF,0x29,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x48,   0,   0,   0,   0,   0,0xFD,0xFF,0xFF,0xFF,0x28,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x5E,   0,   0,   0,   0,0x13,0xFF,0xFF,0xFF,0xFF,0x1A,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x92,   0,   0,   0,   0,0x46,0xFF,0xFF,0xFF,0xF5,0x02,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0xEA,0x0C,   0,   0,   0,0xAB,0xFF,0xFF,0xFF,0xC2,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0xFF,0xB7,0x20,0x0D,0x7C,0xFF,0xFF,0xFF,0xFF,0x6B,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0xF6,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE0,0x08,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x6A,0xEA,0xFF,0xFF,0xFF,0xFF,0xFF,0xEE,0x31,   0,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,0x1C,0x9E,0xE7,0xF9,0xDF,0x95,0x1A,   0,   0,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
 // 'q'
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -3290,33 +2871,28 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x1C,0x93,0xDE,0xF8,0xE4,0xA7,0x32,0x3A,0xFF,0xFF,0xFF,0x4F,   0,
-   0,   0,   0,0x3C,0xF1,0xFF,0xFF,0xFF,0xFF,0xFF,0xFB,0xAF,0xFF,0xFF,0xFF,0x4F,   0,
-   0,   0,0x16,0xEE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x4F,   0,
-   0,   0,0x92,0xFF,0xFF,0xFF,0xF9,0x85,0x4C,0x64,0xCE,0xFF,0xFF,0xFF,0xFF,0x4F,   0,
-   0,0x04,0xED,0xFF,0xFF,0xFF,0x60,   0,   0,   0,0x09,0xD5,0xFF,0xFF,0xFF,0x4F,   0,
-   0,0x2D,0xFF,0xFF,0xFF,0xE8,0x04,   0,   0,   0,   0,0xA3,0xFF,0xFF,0xFF,0x4F,   0,
-   0,0x52,0xFF,0xFF,0xFF,0xA9,   0,   0,   0,   0,   0,0xA3,0xFF,0xFF,0xFF,0x4F,   0,
-   0,0x62,0xFF,0xFF,0xFF,0x91,   0,   0,   0,   0,   0,0xA3,0xFF,0xFF,0xFF,0x4F,   0,
-   0,0x62,0xFF,0xFF,0xFF,0x90,   0,   0,   0,   0,   0,0xA3,0xFF,0xFF,0xFF,0x4F,   0,
-   0,0x52,0xFF,0xFF,0xFF,0xA8,   0,   0,   0,   0,   0,0xA3,0xFF,0xFF,0xFF,0x4F,   0,
-   0,0x29,0xFF,0xFF,0xFF,0xE4,0x02,   0,   0,   0,   0,0xA3,0xFF,0xFF,0xFF,0x4F,   0,
-   0,0x02,0xE8,0xFF,0xFF,0xFF,0x56,   0,   0,   0,0x04,0xD0,0xFF,0xFF,0xFF,0x4F,   0,
-   0,   0,0x89,0xFF,0xFF,0xFF,0xF4,0x71,0x3B,0x54,0xC1,0xFF,0xFF,0xFF,0xFF,0x4F,   0,
-   0,   0,0x11,0xE8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x4F,   0,
-   0,   0,   0,0x35,0xED,0xFF,0xFF,0xFF,0xFF,0xFF,0xF6,0xD8,0xFF,0xFF,0xFF,0x4F,   0,
-   0,   0,   0,   0,0x1A,0x93,0xDE,0xF8,0xE9,0xA7,0x2B,0xA3,0xFF,0xFF,0xFF,0x4F,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xA3,0xFF,0xFF,0xFF,0x4F,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xA3,0xFF,0xFF,0xFF,0x4F,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xA3,0xFF,0xFF,0xFF,0x4F,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xA3,0xFF,0xFF,0xFF,0x4F,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xA3,0xFF,0xFF,0xFF,0x4F,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xA3,0xFF,0xFF,0xFF,0x4F,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x01,0x63,0xC8,0xF2,0xF1,0xC4,0x56,   0,0xCC,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,0x02,0xA9,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x87,0xCC,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,0x72,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF4,0xFF,0xFF,0xFF,0x54,   0,
+   0,0x06,0xED,0xFF,0xFF,0xFF,0xD0,0x2D,0x0A,0x62,0xFA,0xFF,0xFF,0xFF,0xFF,0x54,   0,
+   0,0x4A,0xFF,0xFF,0xFF,0xFB,0x23,   0,   0,   0,0x83,0xFF,0xFF,0xFF,0xFF,0x54,   0,
+   0,0x80,0xFF,0xFF,0xFF,0xBA,   0,   0,   0,   0,0x1D,0xFF,0xFF,0xFF,0xFF,0x54,   0,
+   0,0xA3,0xFF,0xFF,0xFF,0x86,   0,   0,   0,   0,   0,0xE8,0xFF,0xFF,0xFF,0x54,   0,
+   0,0xB1,0xFF,0xFF,0xFF,0x71,   0,   0,   0,   0,   0,0xD2,0xFF,0xFF,0xFF,0x54,   0,
+   0,0xB2,0xFF,0xFF,0xFF,0x70,   0,   0,   0,   0,   0,0xD2,0xFF,0xFF,0xFF,0x54,   0,
+   0,0xA3,0xFF,0xFF,0xFF,0x86,   0,   0,   0,   0,   0,0xE8,0xFF,0xFF,0xFF,0x54,   0,
+   0,0x81,0xFF,0xFF,0xFF,0xBA,   0,   0,   0,   0,0x1C,0xFF,0xFF,0xFF,0xFF,0x54,   0,
+   0,0x4B,0xFF,0xFF,0xFF,0xFB,0x23,   0,   0,   0,0x83,0xFF,0xFF,0xFF,0xFF,0x54,   0,
+   0,0x07,0xEF,0xFF,0xFF,0xFF,0xCF,0x2C,0x09,0x61,0xFA,0xFF,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,0x74,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF7,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,0x02,0xA8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x87,0xCC,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,   0,   0,0x5E,0xC3,0xF0,0xF5,0xC8,0x58,   0,0xCC,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xCC,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xCC,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xCC,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xCC,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xCC,0xFF,0xFF,0xFF,0x54,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xCC,0xFF,0xFF,0xFF,0x54,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
 // 'r'
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -3330,27 +2906,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,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0xEF,0xFF,0xFF,0xC3,   0,0x03,0x64,0xC5,0xEF,0xFB,0xF4,0xBA,   0,
-   0,   0,   0,   0,0xEF,0xFF,0xFF,0xD4,0x16,0xC4,0xFF,0xFF,0xFF,0xFF,0xFF,0xB0,   0,
-   0,   0,   0,   0,0xEF,0xFF,0xFF,0xEB,0xCA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x8E,   0,
-   0,   0,   0,   0,0xEF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x6B,   0,
-   0,   0,   0,   0,0xEF,0xFF,0xFF,0xFF,0xFF,0xBE,0x48,0x19,0x0F,0x21,0x48,0x21,   0,
-   0,   0,   0,   0,0xEF,0xFF,0xFF,0xFF,0xA8,0x03,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0xEF,0xFF,0xFF,0xFF,0x18,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0xEF,0xFF,0xFF,0xFF,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0xEF,0xFF,0xFF,0xFF,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0xEF,0xFF,0xFF,0xFF,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0xEF,0xFF,0xFF,0xFF,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0xEF,0xFF,0xFF,0xFF,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0xEF,0xFF,0xFF,0xFF,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0xEF,0xFF,0xFF,0xFF,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0xEF,0xFF,0xFF,0xFF,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0xEF,0xFF,0xFF,0xFF,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,0x0B,0x79,0xCD,0xF0,0xF7,0xC9,0x60,0x05,
+   0,   0,   0,   0,0xE0,0xFF,0xFF,0xFF,0x5B,0xD8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x4C,
+   0,   0,   0,   0,0xE0,0xFF,0xFF,0xFF,0xE7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x4C,
+   0,   0,   0,   0,0xE0,0xFF,0xFF,0xFF,0xFF,0xF8,0x80,0x27,0x08,0x1B,0x6F,0xF2,0x4C,
+   0,   0,   0,   0,0xE0,0xFF,0xFF,0xFF,0xFC,0x42,   0,   0,   0,   0,   0,0x2F,0x3E,
+   0,   0,   0,   0,0xE0,0xFF,0xFF,0xFF,0xA8,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0xE0,0xFF,0xFF,0xFF,0x66,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0xE0,0xFF,0xFF,0xFF,0x4E,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0xE0,0xFF,0xFF,0xFF,0x46,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0xE0,0xFF,0xFF,0xFF,0x44,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -3370,27 +2941,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,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x09,0x63,0xB6,0xE7,0xFA,0xF3,0xDA,0xA1,0x49,   0,   0,   0,   0,
-   0,   0,   0,0x2F,0xDD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC3,0x17,   0,   0,
-   0,   0,0x18,0xEC,0xFF,0xFF,0xFF,0xFF,0xF1,0xFC,0xFF,0xFF,0xFF,0xFF,0xCF,0x05,   0,
-   0,   0,0x89,0xFF,0xFF,0xFF,0xA6,0x19,   0,0x06,0x4A,0xE5,0xFF,0xFF,0xFF,0x59,   0,
-   0,   0,0xBE,0xFF,0xFF,0xFF,0x14,   0,   0,   0,   0,0x67,0xFF,0xFF,0xFF,0x95,   0,
-   0,   0,0xAE,0xFF,0xFF,0xFF,0x71,0x01,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x4C,0xFF,0xFF,0xFF,0xFF,0xDA,0x95,0x64,0x2A,0x01,   0,   0,   0,   0,   0,
-   0,   0,   0,0x77,0xFD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEF,0x9E,0x2B,   0,   0,   0,
-   0,   0,   0,   0,0x32,0xAC,0xF7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFC,0x6D,   0,   0,
-   0,   0,   0,   0,   0,   0,0x09,0x46,0x88,0xC2,0xFA,0xFF,0xFF,0xFF,0xFE,0x3B,   0,
-   0,0x0D,0x33,0x33,0x33,0x19,   0,   0,   0,   0,0x12,0xA0,0xFF,0xFF,0xFF,0x98,   0,
-   0,0x2C,0xFF,0xFF,0xFF,0xA9,   0,   0,   0,   0,   0,0x30,0xFF,0xFF,0xFF,0xAA,   0,
-   0,0x01,0xDB,0xFF,0xFF,0xFF,0x89,0x14,   0,   0,0x1E,0xB0,0xFF,0xFF,0xFF,0x7C,   0,
-   0,   0,0x44,0xFB,0xFF,0xFF,0xFF,0xFE,0xE9,0xED,0xFF,0xFF,0xFF,0xFF,0xE7,0x15,   0,
-   0,   0,   0,0x48,0xE8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD5,0x29,   0,   0,
-   0,   0,   0,   0,0x0D,0x6E,0xBA,0xE8,0xFA,0xF6,0xDE,0xAC,0x58,0x04,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x12,0x79,0xC3,0xEC,0xFB,0xEE,0xD6,0xB5,0x70,0x26,   0,   0,   0,
+   0,   0,   0,0x3A,0xEB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x08,   0,   0,
+   0,   0,0x10,0xEA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x08,   0,   0,
+   0,   0,0x63,0xFF,0xFF,0xFF,0xD0,0x3A,0x0C,0x09,0x23,0x40,0x85,0xD6,0x07,   0,   0,
+   0,   0,0x88,0xFF,0xFF,0xFF,0x73,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x7F,0xFF,0xFF,0xFF,0xF3,0x7B,0x22,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x3D,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE1,0xA2,0x5B,0x0A,   0,   0,   0,   0,
+   0,   0,   0,0xA6,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xED,0x5B,   0,   0,   0,
+   0,   0,   0,0x03,0x78,0xEC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x52,   0,   0,
+   0,   0,   0,   0,   0,0x06,0x46,0x88,0xC5,0xF9,0xFF,0xFF,0xFF,0xFF,0xD3,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0x0C,0x6F,0xFE,0xFF,0xFF,0xFF,0x0C,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0xDC,0xFF,0xFF,0xFF,0x14,   0,
+   0,   0,0x4C,0xC7,0x83,0x44,0x27,0x10,0x05,0x1D,0x76,0xFE,0xFF,0xFF,0xF1,0x02,   0,
+   0,   0,0x50,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x95,   0,   0,
+   0,   0,0x50,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC1,0x0E,   0,   0,
+   0,   0,0x03,0x33,0x72,0xAF,0xD1,0xE7,0xFA,0xF6,0xDE,0xAE,0x58,0x02,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -3405,32 +2971,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,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xB7,0xFF,0xFF,0xFF,0x37,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xB7,0xFF,0xFF,0xFF,0x37,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xB7,0xFF,0xFF,0xFF,0x37,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xB7,0xFF,0xFF,0xFF,0x37,   0,   0,   0,   0,   0,   0,   0,
-   0,0x37,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEF,   0,   0,
-   0,0x37,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEF,   0,   0,
-   0,0x37,0xFB,0xFB,0xFB,0xFE,0xFF,0xFF,0xFF,0xFC,0xFB,0xFB,0xFB,0xFB,0xEC,   0,   0,
-   0,   0,   0,   0,   0,0xB7,0xFF,0xFF,0xFF,0x37,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xB7,0xFF,0xFF,0xFF,0x37,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xB7,0xFF,0xFF,0xFF,0x37,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xB7,0xFF,0xFF,0xFF,0x37,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xB7,0xFF,0xFF,0xFF,0x37,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xB7,0xFF,0xFF,0xFF,0x37,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xB7,0xFF,0xFF,0xFF,0x38,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xB1,0xFF,0xFF,0xFF,0x48,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x9B,0xFF,0xFF,0xFF,0x9B,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x63,0xFF,0xFF,0xFF,0xFE,0x9C,0x55,0x4F,0x67,0x8E,0x2F,   0,
-   0,   0,   0,   0,   0,0x0D,0xEC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x63,   0,
-   0,   0,   0,   0,   0,   0,0x44,0xF5,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x87,   0,
-   0,   0,   0,   0,   0,   0,   0,0x26,0x9B,0xDE,0xF9,0xF8,0xE4,0xBE,0x7E,0x1B,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x60,0xFF,0xFF,0xFF,0xC4,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x60,0xFF,0xFF,0xFF,0xC4,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x60,0xFF,0xFF,0xFF,0xC4,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x60,0xFF,0xFF,0xFF,0xC4,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x60,0xFF,0xFF,0xFF,0xC4,   0,   0,   0,   0,   0,   0,   0,
+   0,0x6C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x30,   0,
+   0,0x6C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x30,   0,
+   0,0x6C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x30,   0,
+   0,   0,   0,   0,   0,0x60,0xFF,0xFF,0xFF,0xC4,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x60,0xFF,0xFF,0xFF,0xC4,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x60,0xFF,0xFF,0xFF,0xC4,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x60,0xFF,0xFF,0xFF,0xC4,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x60,0xFF,0xFF,0xFF,0xC4,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x60,0xFF,0xFF,0xFF,0xC4,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x60,0xFF,0xFF,0xFF,0xC4,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x5F,0xFF,0xFF,0xFF,0xC4,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x55,0xFF,0xFF,0xFF,0xD9,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x37,0xFF,0xFF,0xFF,0xFF,0x6A,0x0F,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x07,0xED,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x30,   0,
+   0,   0,   0,   0,   0,   0,0x6A,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x30,   0,
+   0,   0,   0,   0,   0,   0,   0,0x41,0xA4,0xD8,0xF3,0xFD,0xFF,0xFF,0xFF,0x30,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -3450,27 +3011,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,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x0F,   0,   0,   0,   0,0x63,0xFF,0xFF,0xFF,0x8F,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x0F,   0,   0,   0,   0,0x63,0xFF,0xFF,0xFF,0x8F,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x0F,   0,   0,   0,   0,0x63,0xFF,0xFF,0xFF,0x8F,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x0F,   0,   0,   0,   0,0x63,0xFF,0xFF,0xFF,0x8F,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x0F,   0,   0,   0,   0,0x63,0xFF,0xFF,0xFF,0x8F,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x0F,   0,   0,   0,   0,0x63,0xFF,0xFF,0xFF,0x8F,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x0F,   0,   0,   0,   0,0x63,0xFF,0xFF,0xFF,0x8F,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x0F,   0,   0,   0,   0,0x63,0xFF,0xFF,0xFF,0x8F,   0,
-   0,   0,0xDF,0xFF,0xFF,0xFF,0x0F,   0,   0,   0,   0,0x63,0xFF,0xFF,0xFF,0x8F,   0,
-   0,   0,0xDC,0xFF,0xFF,0xFF,0x12,   0,   0,   0,   0,0x63,0xFF,0xFF,0xFF,0x8F,   0,
-   0,   0,0xCD,0xFF,0xFF,0xFF,0x21,   0,   0,   0,   0,0x63,0xFF,0xFF,0xFF,0x8F,   0,
-   0,   0,0xA9,0xFF,0xFF,0xFF,0x6A,   0,   0,   0,0x02,0xB2,0xFF,0xFF,0xFF,0x8F,   0,
-   0,   0,0x68,0xFF,0xFF,0xFF,0xF2,0x74,0x48,0x5D,0xC0,0xFF,0xFF,0xFF,0xFF,0x8F,   0,
-   0,   0,0x0E,0xEC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEB,0xFF,0xFF,0xFF,0x8F,   0,
-   0,   0,   0,0x4B,0xF9,0xFF,0xFF,0xFF,0xFF,0xFF,0xD9,0x3F,0xFF,0xFF,0xFF,0x8F,   0,
-   0,   0,   0,   0,0x32,0xAB,0xE8,0xF9,0xDC,0x85,0x0D,0x0C,0xFF,0xFF,0xFF,0x8F,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xBC,0xFF,0xFF,0xFF,0x6C,   0,   0,   0,0x20,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,0xBC,0xFF,0xFF,0xFF,0x6C,   0,   0,   0,0x20,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,0xBC,0xFF,0xFF,0xFF,0x6C,   0,   0,   0,0x20,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,0xBC,0xFF,0xFF,0xFF,0x6C,   0,   0,   0,0x20,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,0xBC,0xFF,0xFF,0xFF,0x6C,   0,   0,   0,0x20,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,0xBC,0xFF,0xFF,0xFF,0x6C,   0,   0,   0,0x20,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,0xBC,0xFF,0xFF,0xFF,0x6C,   0,   0,   0,0x20,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,0xBC,0xFF,0xFF,0xFF,0x6C,   0,   0,   0,0x20,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,0xBC,0xFF,0xFF,0xFF,0x6C,   0,   0,   0,0x20,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,0xBC,0xFF,0xFF,0xFF,0x6C,   0,   0,   0,0x28,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,0xB9,0xFF,0xFF,0xFF,0x7A,   0,   0,   0,0x43,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,0xAC,0xFF,0xFF,0xFF,0xA3,   0,   0,   0,0x91,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,0x83,0xFF,0xFF,0xFF,0xF5,0x4A,0x0E,0x59,0xF8,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,0x32,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF6,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,   0,0x9B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFD,0x75,0xFF,0xFF,0xFF,0xFF,0x08,   0,
+   0,   0,   0,0x02,0x72,0xD4,0xF8,0xEE,0xBA,0x44,0x20,0xFF,0xFF,0xFF,0xFF,0x08,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -3490,27 +3046,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,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0xCD,0xFF,0xFF,0xFF,0x45,   0,   0,   0,   0,   0,   0,0xDE,0xFF,0xFF,0xFF,0x34,
-   0,0x6F,0xFF,0xFF,0xFF,0x91,   0,   0,   0,   0,   0,0x2A,0xFF,0xFF,0xFF,0xD7,   0,
-   0,0x16,0xFB,0xFF,0xFF,0xDE,   0,   0,   0,   0,   0,0x76,0xFF,0xFF,0xFF,0x7A,   0,
-   0,   0,0xB4,0xFF,0xFF,0xFF,0x2A,   0,   0,   0,   0,0xC2,0xFF,0xFF,0xFE,0x1F,   0,
-   0,   0,0x56,0xFF,0xFF,0xFF,0x77,   0,   0,   0,0x12,0xFC,0xFF,0xFF,0xBF,   0,   0,
-   0,   0,0x08,0xF0,0xFF,0xFF,0xC3,   0,   0,   0,0x5A,0xFF,0xFF,0xFF,0x62,   0,   0,
-   0,   0,   0,0x9A,0xFF,0xFF,0xFC,0x13,   0,   0,0xA6,0xFF,0xFF,0xF7,0x0E,   0,   0,
-   0,   0,   0,0x3D,0xFF,0xFF,0xFF,0x5C,   0,0x04,0xEE,0xFF,0xFF,0xA7,   0,   0,   0,
-   0,   0,   0,0x01,0xDE,0xFF,0xFF,0xA9,   0,0x3F,0xFF,0xFF,0xFF,0x4A,   0,   0,   0,
-   0,   0,   0,   0,0x81,0xFF,0xFF,0xF0,0x05,0x8B,0xFF,0xFF,0xE9,0x04,   0,   0,   0,
-   0,   0,   0,   0,0x24,0xFF,0xFF,0xFF,0x42,0xD7,0xFF,0xFF,0x90,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xC6,0xFF,0xFF,0xA5,0xFF,0xFF,0xFF,0x32,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x68,0xFF,0xFF,0xF7,0xFF,0xFF,0xD5,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x11,0xF9,0xFF,0xFF,0xFF,0xFF,0x78,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0xAC,0xFF,0xFF,0xFF,0xFE,0x1D,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x4E,0xFF,0xFF,0xFF,0xBE,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0xB4,0xFF,0xFF,0xFF,0x7A,   0,   0,   0,   0,   0,0x0A,0xF8,0xFF,0xFF,0xFF,0x2B,
+   0,0x64,0xFF,0xFF,0xFF,0xBF,   0,   0,   0,   0,   0,0x49,0xFF,0xFF,0xFF,0xDA,   0,
+   0,0x16,0xFD,0xFF,0xFF,0xF9,0x0B,   0,   0,   0,   0,0x8F,0xFF,0xFF,0xFF,0x89,   0,
+   0,   0,0xC3,0xFF,0xFF,0xFF,0x49,   0,   0,   0,   0,0xD5,0xFF,0xFF,0xFF,0x38,   0,
+   0,   0,0x72,0xFF,0xFF,0xFF,0x8F,   0,   0,   0,0x1B,0xFF,0xFF,0xFF,0xE6,0x01,   0,
+   0,   0,0x21,0xFF,0xFF,0xFF,0xD4,   0,   0,   0,0x61,0xFF,0xFF,0xFF,0x97,   0,   0,
+   0,   0,   0,0xD1,0xFF,0xFF,0xFF,0x1A,   0,   0,0xA6,0xFF,0xFF,0xFF,0x46,   0,   0,
+   0,   0,   0,0x81,0xFF,0xFF,0xFF,0x5E,   0,0x01,0xEA,0xFF,0xFF,0xF0,0x05,   0,   0,
+   0,   0,   0,0x30,0xFF,0xFF,0xFF,0xA3,   0,0x32,0xFF,0xFF,0xFF,0xA5,   0,   0,   0,
+   0,   0,   0,   0,0xDF,0xFF,0xFF,0xE7,0x01,0x78,0xFF,0xFF,0xFF,0x54,   0,   0,   0,
+   0,   0,   0,   0,0x8F,0xFF,0xFF,0xFF,0x2E,0xBE,0xFF,0xFF,0xF7,0x0C,   0,   0,   0,
+   0,   0,   0,   0,0x3F,0xFF,0xFF,0xFF,0x7E,0xF8,0xFF,0xFF,0xB2,   0,   0,   0,   0,
+   0,   0,   0,   0,0x03,0xEA,0xFF,0xFF,0xEF,0xFF,0xFF,0xFF,0x62,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x9E,0xFF,0xFF,0xFF,0xFF,0xFF,0xFC,0x14,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x4D,0xFF,0xFF,0xFF,0xFF,0xFF,0xC0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x08,0xF4,0xFF,0xFF,0xFF,0xFF,0x70,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -3530,27 +3081,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,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-0x8A,0xFF,0xFF,0xFF,0x0B,   0,   0,0xDA,0xFF,0xF4,0x01,   0,   0,0xEF,0xFF,0xFF,0xA4,
-0x5E,0xFF,0xFF,0xFF,0x29,   0,0x09,0xFD,0xFF,0xFF,0x22,   0,0x0D,0xFF,0xFF,0xFF,0x78,
-0x32,0xFF,0xFF,0xFF,0x48,   0,0x33,0xFF,0xFF,0xFF,0x4F,   0,0x2C,0xFF,0xFF,0xFF,0x4C,
-0x09,0xFD,0xFF,0xFF,0x66,   0,0x60,0xFF,0xFF,0xFF,0x7B,   0,0x4A,0xFF,0xFF,0xFF,0x20,
-   0,0xDA,0xFF,0xFF,0x85,   0,0x8C,0xFF,0xFF,0xFF,0xA8,   0,0x69,0xFF,0xFF,0xF4,0x01,
-   0,0xAE,0xFF,0xFF,0xA4,   0,0xB9,0xFF,0xFF,0xFF,0xD5,   0,0x87,0xFF,0xFF,0xC8,   0,
-   0,0x82,0xFF,0xFF,0xC2,   0,0xE5,0xFF,0xC0,0xFF,0xFB,0x06,0xA6,0xFF,0xFF,0x9C,   0,
-   0,0x56,0xFF,0xFF,0xE1,0x12,0xFF,0xFF,0x5D,0xFF,0xFF,0x2E,0xC4,0xFF,0xFF,0x70,   0,
-   0,0x2A,0xFF,0xFF,0xFC,0x43,0xFF,0xFC,0x0B,0xF2,0xFF,0x5B,0xE3,0xFF,0xFF,0x44,   0,
-   0,0x04,0xF9,0xFF,0xFF,0x8B,0xFF,0xD3,   0,0xC2,0xFF,0x8D,0xFD,0xFF,0xFF,0x18,   0,
-   0,   0,0xD2,0xFF,0xFF,0xD6,0xFF,0xA2,   0,0x8F,0xFF,0xD7,0xFF,0xFF,0xED,   0,   0,
-   0,   0,0xA6,0xFF,0xFF,0xFF,0xFF,0x71,   0,0x5C,0xFF,0xFF,0xFF,0xFF,0xC0,   0,   0,
-   0,   0,0x7A,0xFF,0xFF,0xFF,0xFF,0x3F,   0,0x29,0xFF,0xFF,0xFF,0xFF,0x94,   0,   0,
-   0,   0,0x4E,0xFF,0xFF,0xFF,0xFF,0x0F,   0,0x02,0xF4,0xFF,0xFF,0xFF,0x68,   0,   0,
-   0,   0,0x22,0xFF,0xFF,0xFF,0xDD,   0,   0,   0,0xC4,0xFF,0xFF,0xFF,0x3C,   0,   0,
-   0,   0,0x01,0xF4,0xFF,0xFF,0xAC,   0,   0,   0,0x91,0xFF,0xFF,0xFF,0x11,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+0xE9,0xFF,0xFF,0x87,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x13,0xFF,0xFF,0xFF,
+0xBC,0xFF,0xFF,0xAF,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x3C,0xFF,0xFF,0xFF,
+0x8E,0xFF,0xFF,0xD6,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x64,0xFF,0xFF,0xFA,
+0x60,0xFF,0xFF,0xFA,0x04,   0,   0,   0,   0,   0,   0,   0,   0,0x8C,0xFF,0xFF,0xD2,
+0x32,0xFF,0xFF,0xFF,0x26,   0,0x10,0xFE,0xFF,0xFF,0x81,   0,   0,0xB4,0xFF,0xFF,0xA4,
+0x07,0xFB,0xFF,0xFF,0x4D,   0,0x44,0xFF,0xFF,0xFF,0xB6,   0,   0,0xDC,0xFF,0xFF,0x76,
+   0,0xD6,0xFF,0xFF,0x75,   0,0x79,0xFF,0xFF,0xFF,0xEB,   0,0x07,0xFC,0xFF,0xFF,0x48,
+   0,0xA8,0xFF,0xFF,0x9D,   0,0xAE,0xFF,0xF4,0xFF,0xFF,0x1F,0x2C,0xFF,0xFF,0xFF,0x1A,
+   0,0x7A,0xFF,0xFF,0xC4,   0,0xE3,0xFF,0x93,0xFE,0xFF,0x54,0x54,0xFF,0xFF,0xEC,   0,
+   0,0x4C,0xFF,0xFF,0xEC,0x18,0xFF,0xFF,0x47,0xD6,0xFF,0x89,0x7C,0xFF,0xFF,0xBE,   0,
+   0,0x1E,0xFF,0xFF,0xFF,0x62,0xFF,0xFE,0x10,0x9B,0xFF,0xBD,0xA4,0xFF,0xFF,0x90,   0,
+   0,   0,0xEF,0xFF,0xFF,0xBF,0xFF,0xD4,   0,0x61,0xFF,0xF1,0xCD,0xFF,0xFF,0x62,   0,
+   0,   0,0xC2,0xFF,0xFF,0xFE,0xFF,0x9A,   0,0x26,0xFF,0xFF,0xFE,0xFF,0xFF,0x34,   0,
+   0,   0,0x94,0xFF,0xFF,0xFF,0xFF,0x60,   0,   0,0xEA,0xFF,0xFF,0xFF,0xFD,0x09,   0,
+   0,   0,0x66,0xFF,0xFF,0xFF,0xFF,0x26,   0,   0,0xB0,0xFF,0xFF,0xFF,0xD8,   0,   0,
+   0,   0,0x37,0xFF,0xFF,0xFF,0xEC,   0,   0,   0,0x75,0xFF,0xFF,0xFF,0xAA,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -3570,27 +3116,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,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x3B,0xFD,0xFF,0xFF,0xED,0x1A,   0,   0,   0,   0,0x13,0xE6,0xFF,0xFF,0xFF,0x48,
-   0,   0,0x92,0xFF,0xFF,0xFF,0xB7,   0,   0,   0,   0,0xAE,0xFF,0xFF,0xFF,0xA1,   0,
-   0,   0,0x0C,0xE0,0xFF,0xFF,0xFF,0x69,   0,   0,0x62,0xFF,0xFF,0xFF,0xE8,0x12,   0,
-   0,   0,   0,0x46,0xFF,0xFF,0xFF,0xF5,0x25,0x23,0xF3,0xFF,0xFF,0xFF,0x53,   0,   0,
-   0,   0,   0,   0,0x9F,0xFF,0xFF,0xFF,0xC7,0xC7,0xFF,0xFF,0xFF,0xAD,   0,   0,   0,
-   0,   0,   0,   0,0x11,0xE8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEE,0x18,   0,   0,   0,
-   0,   0,   0,   0,   0,0x53,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x5F,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0xAF,0xFF,0xFF,0xFF,0xFF,0xBA,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x04,0xCE,0xFF,0xFF,0xFF,0xFF,0xD6,0x07,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x7A,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x85,   0,   0,   0,   0,
-   0,   0,   0,   0,0x29,0xF8,0xFF,0xFF,0xFC,0xFB,0xFF,0xFF,0xFB,0x32,   0,   0,   0,
-   0,   0,   0,0x02,0xC6,0xFF,0xFF,0xFF,0x87,0x7F,0xFF,0xFF,0xFF,0xD0,0x05,   0,   0,
-   0,   0,   0,0x71,0xFF,0xFF,0xFF,0xD5,0x07,0x04,0xCD,0xFF,0xFF,0xFF,0x7E,   0,   0,
-   0,   0,0x23,0xF5,0xFF,0xFF,0xFC,0x35,   0,   0,0x2C,0xF9,0xFF,0xFF,0xFA,0x2D,   0,
-   0,0x01,0xBF,0xFF,0xFF,0xFF,0x84,   0,   0,   0,   0,0x78,0xFF,0xFF,0xFF,0xCB,0x03,
-   0,0x68,0xFF,0xFF,0xFF,0xD3,0x06,   0,   0,   0,   0,0x03,0xC7,0xFF,0xFF,0xFF,0x77,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x66,0xFF,0xFF,0xFF,0xFF,0x5E,   0,   0,   0,0x07,0xDF,0xFF,0xFF,0xFF,0xD5,0x08,
+   0,   0,0xB1,0xFF,0xFF,0xFF,0xE2,0x08,   0,   0,0x76,0xFF,0xFF,0xFF,0xFA,0x31,   0,
+   0,   0,0x15,0xE8,0xFF,0xFF,0xFF,0x78,   0,0x14,0xF0,0xFF,0xFF,0xFF,0x78,   0,   0,
+   0,   0,   0,0x4A,0xFF,0xFF,0xFF,0xF1,0x14,0x94,0xFF,0xFF,0xFF,0xC3,0x02,   0,   0,
+   0,   0,   0,   0,0x95,0xFF,0xFF,0xFF,0xB1,0xFB,0xFF,0xFF,0xF2,0x21,   0,   0,   0,
+   0,   0,   0,   0,0x09,0xD7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x60,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x32,0xFA,0xFF,0xFF,0xFF,0xFF,0xAE,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x8D,0xFF,0xFF,0xFF,0xFA,0x16,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x10,0xE2,0xFF,0xFF,0xFF,0xFF,0x76,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0xA7,0xFF,0xFF,0xFF,0xFF,0xFF,0xF9,0x2E,   0,   0,   0,   0,
+   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xE9,0xFF,0xFF,0xFF,0xD3,0x07,   0,   0,   0,
+   0,   0,   0,0x1E,0xF0,0xFF,0xFF,0xFE,0x37,0xC3,0xFF,0xFF,0xFF,0x8D,   0,   0,   0,
+   0,   0,0x02,0xC0,0xFF,0xFF,0xFF,0xA1,   0,0x32,0xFD,0xFF,0xFF,0xFE,0x41,   0,   0,
+   0,   0,0x77,0xFF,0xFF,0xFF,0xF4,0x1A,   0,   0,0x9B,0xFF,0xFF,0xFF,0xE1,0x0F,   0,
+   0,0x30,0xF9,0xFF,0xFF,0xFF,0x7B,   0,   0,   0,0x16,0xF0,0xFF,0xFF,0xFF,0xA4,   0,
+0x08,0xD5,0xFF,0xFF,0xFF,0xE0,0x08,   0,   0,   0,   0,0x72,0xFF,0xFF,0xFF,0xFF,0x56,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -3610,33 +3151,28 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-0x15,0xF8,0xFF,0xFF,0xFF,0x3B,   0,   0,   0,   0,   0,   0,0x21,0xFE,0xFF,0xFF,0xFF,
-   0,0x9E,0xFF,0xFF,0xFF,0x9B,   0,   0,   0,   0,   0,   0,0x7F,0xFF,0xFF,0xFF,0xC1,
-   0,0x31,0xFF,0xFF,0xFF,0xF1,0x0A,   0,   0,   0,   0,0x01,0xDE,0xFF,0xFF,0xFF,0x52,
-   0,   0,0xC2,0xFF,0xFF,0xFF,0x5B,   0,   0,   0,   0,0x3F,0xFF,0xFF,0xFF,0xE1,0x03,
-   0,   0,0x54,0xFF,0xFF,0xFF,0xBC,   0,   0,   0,   0,0x9F,0xFF,0xFF,0xFF,0x75,   0,
-   0,   0,0x04,0xE2,0xFF,0xFF,0xFE,0x1E,   0,   0,0x0B,0xF3,0xFF,0xFF,0xF5,0x12,   0,
-   0,   0,   0,0x78,0xFF,0xFF,0xFF,0x7C,   0,   0,0x5F,0xFF,0xFF,0xFF,0x98,   0,   0,
-   0,   0,   0,0x13,0xF7,0xFF,0xFF,0xDC,   0,   0,0xBF,0xFF,0xFF,0xFF,0x2B,   0,   0,
-   0,   0,   0,   0,0x9C,0xFF,0xFF,0xFF,0x3C,0x20,0xFE,0xFF,0xFF,0xBB,   0,   0,   0,
-   0,   0,   0,   0,0x2F,0xFF,0xFF,0xFF,0x97,0x7E,0xFF,0xFF,0xFF,0x4C,   0,   0,   0,
-   0,   0,   0,   0,   0,0xC0,0xFF,0xFF,0xDE,0xDB,0xFF,0xFF,0xDC,0x02,   0,   0,   0,
-   0,   0,   0,   0,   0,0x51,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x6F,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x03,0xE0,0xFF,0xFF,0xFF,0xFF,0xF3,0x0E,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x75,0xFF,0xFF,0xFF,0xFF,0x92,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x11,0xF5,0xFF,0xFF,0xFE,0x26,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x12,0xF0,0xFF,0xFF,0xB5,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x8C,0xFF,0xFF,0xFF,0x46,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x32,0xFA,0xFF,0xFF,0xD7,0x01,   0,   0,   0,   0,   0,   0,
-   0,   0,0x03,0x53,0x67,0xE9,0xFF,0xFF,0xFF,0x61,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x25,0xFF,0xFF,0xFF,0xFF,0xFF,0xCA,0x04,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x4E,0xFF,0xFF,0xFF,0xFF,0xE0,0x1C,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x5A,0xED,0xFA,0xE0,0x8C,0x12,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+0x0A,0xF0,0xFF,0xFF,0xFF,0x60,   0,   0,   0,   0,   0,   0,0xDE,0xFF,0xFF,0xFF,0x78,
+   0,0x97,0xFF,0xFF,0xFF,0xB9,   0,   0,   0,   0,   0,0x34,0xFF,0xFF,0xFF,0xFD,0x1C,
+   0,0x34,0xFF,0xFF,0xFF,0xFC,0x16,   0,   0,   0,   0,0x8A,0xFF,0xFF,0xFF,0xBB,   0,
+   0,   0,0xD0,0xFF,0xFF,0xFF,0x6C,   0,   0,   0,   0,0xDE,0xFF,0xFF,0xFF,0x5C,   0,
+   0,   0,0x6D,0xFF,0xFF,0xFF,0xC5,   0,   0,   0,0x35,0xFF,0xFF,0xFF,0xF3,0x0A,   0,
+   0,   0,0x11,0xF7,0xFF,0xFF,0xFE,0x1F,   0,   0,0x8A,0xFF,0xFF,0xFF,0x9F,   0,   0,
+   0,   0,   0,0xA6,0xFF,0xFF,0xFF,0x78,   0,   0,0xDE,0xFF,0xFF,0xFF,0x40,   0,   0,
+   0,   0,   0,0x43,0xFF,0xFF,0xFF,0xD1,   0,0x35,0xFF,0xFF,0xFF,0xE0,0x01,   0,   0,
+   0,   0,   0,0x01,0xDE,0xFF,0xFF,0xFF,0x2A,0x8B,0xFF,0xFF,0xFF,0x83,   0,   0,   0,
+   0,   0,   0,   0,0x7C,0xFF,0xFF,0xFF,0x84,0xDF,0xFF,0xFF,0xFF,0x25,   0,   0,   0,
+   0,   0,   0,   0,0x1C,0xFC,0xFF,0xFF,0xF2,0xFF,0xFF,0xFF,0xC6,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0xB5,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x67,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x52,0xFF,0xFF,0xFF,0xFF,0xFF,0xF8,0x10,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x05,0xE9,0xFF,0xFF,0xFF,0xFF,0xAA,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x8B,0xFF,0xFF,0xFF,0xFF,0x4C,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x39,0xFF,0xFF,0xFF,0xE9,0x04,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x77,0xFF,0xFF,0xFF,0x8E,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x06,0xE0,0xFF,0xFF,0xFF,0x30,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x03,0x21,0xA3,0xFF,0xFF,0xFF,0xC6,   0,   0,   0,   0,   0,   0,   0,
+   0,0x34,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x44,   0,   0,   0,   0,   0,   0,   0,
+   0,0x34,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x8B,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x34,0xFF,0xFF,0xFF,0xF3,0xC9,0x56,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
 // 'z'
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -3650,27 +3186,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,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x1F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB7,   0,
-   0,0x1F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB7,   0,
-   0,0x1F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x95,   0,
-   0,0x08,0x47,0x47,0x47,0x47,0x47,0x47,0x47,0x5B,0xF6,0xFF,0xFF,0xFF,0xCA,0x09,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x05,0xC0,0xFF,0xFF,0xFF,0xE3,0x19,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x9B,0xFF,0xFF,0xFF,0xF4,0x30,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x72,0xFF,0xFF,0xFF,0xFE,0x50,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x4C,0xFD,0xFF,0xFF,0xFF,0x77,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x2D,0xF2,0xFF,0xFF,0xFF,0xA0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x16,0xE0,0xFF,0xFF,0xFF,0xC3,0x06,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x07,0xC5,0xFF,0xFF,0xFF,0xDE,0x14,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0xA3,0xFF,0xFF,0xFF,0xF1,0x2A,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x7A,0xFF,0xFF,0xFF,0xFF,0x83,0x3B,0x3B,0x3B,0x3B,0x3B,0x3B,0x3B,0x3B,0x04,
-   0,0x39,0xFE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x13,
-   0,0x53,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x13,
-   0,0x53,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x13,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x5C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x50,   0,
+   0,   0,0x5C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x50,   0,
+   0,   0,0x5C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x50,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0x06,0xC0,0xFF,0xFF,0xFF,0xF3,0x26,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,   0,0xA2,0xFF,0xFF,0xFF,0xFC,0x4A,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0x80,0xFF,0xFF,0xFF,0xFF,0x6B,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x5C,0xFF,0xFF,0xFF,0xFF,0x8E,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x3E,0xF9,0xFF,0xFF,0xFF,0xB0,0x02,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x27,0xED,0xFF,0xFF,0xFF,0xCB,0x0A,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x14,0xDC,0xFF,0xFF,0xFF,0xE1,0x18,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x08,0xC5,0xFF,0xFF,0xFF,0xF1,0x2C,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x01,0xA9,0xFF,0xFF,0xFF,0xFB,0x46,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x7D,0xFF,0xFF,0xFF,0xFF,0x66,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x50,   0,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x50,   0,
+   0,   0,0xB4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x50,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -3684,38 +3215,33 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x05,0x2E,0x15,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x01,0x71,0xEB,0xFF,0x79,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x8A,0xFF,0xFF,0xFF,0xB0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x35,0xFE,0xFF,0xFF,0x6E,0x0A,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x9E,0xFF,0xFF,0xC9,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xDF,0xFF,0xFF,0x96,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x03,0xFE,0xFF,0xFF,0x83,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x0F,0xFF,0xFF,0xFF,0x80,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x0F,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x11,0xFF,0xFF,0xFF,0x7D,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x26,0xFF,0xFF,0xFF,0x61,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x71,0xFF,0xFF,0xFE,0x27,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x11,0x6E,0xF5,0xFF,0xFF,0xA9,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x99,0xFF,0xFF,0xFF,0xFF,0xBA,0x0A,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x9F,0xFF,0xFF,0xFF,0x8B,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x9F,0xFF,0xFF,0xFF,0xFF,0x9F,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x06,0x27,0x8A,0xFC,0xFF,0xFF,0x8C,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x86,0xFF,0xFF,0xF8,0x16,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x2E,0xFF,0xFF,0xFF,0x59,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x14,0xFF,0xFF,0xFF,0x77,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x0F,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x0F,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x09,0xFF,0xFF,0xFF,0x85,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xF1,0xFF,0xFF,0x95,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0xBF,0xFF,0xFF,0xC3,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x6A,0xFF,0xFF,0xF9,0x1A,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x08,0xDE,0xFF,0xFF,0xCC,0x44,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x31,0xEE,0xFF,0xFF,0xA0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,0x21,0xA0,0xE6,0x69,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0x31,0x9C,0xD3,0xF1,0xFC,0xFF,0xE8,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x40,0xFC,0xFF,0xFF,0xFF,0xFF,0xFF,0xE8,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xBC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE8,   0,   0,
+   0,   0,   0,   0,   0,   0,0x02,0xF6,0xFF,0xFF,0xFF,0x6D,0x15,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x14,0xFF,0xFF,0xFF,0xD8,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x1E,0xFF,0xFF,0xFF,0xB9,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x20,0xFF,0xFF,0xFF,0xB4,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x20,0xFF,0xFF,0xFF,0xB4,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x22,0xFF,0xFF,0xFF,0xB3,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x36,0xFF,0xFF,0xFF,0xAD,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x77,0xFF,0xFF,0xFF,0x97,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x02,0x17,0x63,0xF3,0xFF,0xFF,0xFF,0x5A,   0,   0,   0,   0,   0,   0,
+   0,   0,0x80,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB6,0x04,   0,   0,   0,   0,   0,   0,
+   0,   0,0x80,0xFF,0xFF,0xFF,0xFF,0xF3,0x7E,0x01,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x80,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB3,0x03,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x02,0x18,0x66,0xF4,0xFF,0xFF,0xFF,0x56,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x79,0xFF,0xFF,0xFF,0x96,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x36,0xFF,0xFF,0xFF,0xAD,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x22,0xFF,0xFF,0xFF,0xB3,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x20,0xFF,0xFF,0xFF,0xB4,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x20,0xFF,0xFF,0xFF,0xB4,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x1E,0xFF,0xFF,0xFF,0xBA,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x14,0xFF,0xFF,0xFF,0xD8,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x02,0xF5,0xFF,0xFF,0xFF,0x6D,0x14,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xBB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE8,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x40,0xFC,0xFF,0xFF,0xFF,0xFF,0xFF,0xE8,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0x32,0x9D,0xD5,0xF2,0xFC,0xFF,0xE8,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
 // '|'
@@ -3724,78 +3250,68 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x73,0xFF,0xFF,0x03,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0xE4,0xFF,0xFF,0x54,   0,   0,   0,   0,   0,   0,
 // '}'
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x2F,0x19,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x04,0xF5,0xFF,0xBC,0x22,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x30,0xFF,0xFF,0xFF,0xE9,0x1D,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x01,0x28,0xD0,0xFF,0xFF,0xB3,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x4A,0xFF,0xFF,0xFF,0x1E,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x1A,0xFF,0xFF,0xFF,0x5F,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x06,0xFF,0xFF,0xFF,0x83,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0xFF,0xFF,0xFF,0x8F,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0xFF,0xFF,0xFF,0x8F,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0xFE,0xFF,0xFF,0x92,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0xEC,0xFF,0xFF,0xA8,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0xB2,0xFF,0xFF,0xEA,0x09,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x3E,0xFE,0xFF,0xFF,0xB3,0x27,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x69,0xFD,0xFF,0xFF,0xFF,0xF6,0x1D,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,0x41,0xF9,0xFF,0xFF,0xFF,0x1F,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,0x42,0xEA,0xFF,0xFF,0xFF,0xFF,0x1F,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x20,0xEF,0xFF,0xFF,0xCC,0x42,0x0D,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0x91,0xFF,0xFF,0xF2,0x13,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0xDB,0xFF,0xFF,0xB0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0xF8,0xFF,0xFF,0x95,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0xFF,0xFF,0xFF,0x8F,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,0xFF,0xFF,0xFF,0x8F,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x06,0xFF,0xFF,0xFF,0x88,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x19,0xFF,0xFF,0xFF,0x6D,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x48,0xFF,0xFF,0xFF,0x37,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,0x9A,0xFF,0xFF,0xE0,0x01,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x15,0x84,0xFE,0xFF,0xFF,0x62,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x21,0xFF,0xFF,0xFF,0x9F,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0xE1,0xCE,0x64,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x74,0xFF,0xFF,0xF6,0xE4,0xB9,0x66,0x03,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x74,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA8,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x74,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x28,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x08,0x35,0xD4,0xFF,0xFF,0xFF,0x64,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x65,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x46,0xFF,0xFF,0xFF,0x8A,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x40,0xFF,0xFF,0xFF,0x8C,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x40,0xFF,0xFF,0xFF,0x8C,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x40,0xFF,0xFF,0xFF,0x8E,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x3B,0xFF,0xFF,0xFF,0xA1,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x24,0xFF,0xFF,0xFF,0xE0,0x04,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x01,0xE6,0xFF,0xFF,0xFF,0xAA,0x30,0x08,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x54,0xF7,0xFF,0xFF,0xFF,0xFF,0xFF,0xF8,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,0x33,0xD0,0xFF,0xFF,0xFF,0xFF,0xF8,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,0x4F,0xF6,0xFF,0xFF,0xFF,0xFF,0xFF,0xF8,   0,   0,
+   0,   0,   0,   0,   0,   0,0x01,0xE4,0xFF,0xFF,0xFF,0xAD,0x32,0x09,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x23,0xFF,0xFF,0xFF,0xE1,0x04,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x3B,0xFF,0xFF,0xFF,0xA1,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x40,0xFF,0xFF,0xFF,0x8E,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x40,0xFF,0xFF,0xFF,0x8C,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x40,0xFF,0xFF,0xFF,0x8C,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x47,0xFF,0xFF,0xFF,0x8A,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,0x67,0xFF,0xFF,0xFF,0x7F,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x08,0x34,0xD5,0xFF,0xFF,0xFF,0x63,   0,   0,   0,   0,   0,   0,
+   0,   0,0x74,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x27,   0,   0,   0,   0,   0,   0,
+   0,   0,0x74,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA8,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x74,0xFF,0xFF,0xF7,0xE5,0xBA,0x68,0x03,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
 // '~'
@@ -3815,16 +3331,11 @@
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x1D,0x48,0x3A,0x09,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x09,0xA5,0xFE,0xFF,0xFF,0xF3,0x8D,0x0D,   0,   0,   0,   0,0x46,0x75,0x5F,0x0F,
-   0,0xA9,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD9,0x2D,   0,   0,   0,0xC3,0xFF,0xFF,0x23,
-0x31,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF8,0x93,0x59,0xA5,0xFF,0xFF,0xF0,0x02,
-0x7A,0xFF,0xFF,0xBB,0x1A,0x1A,0x7B,0xF7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x96,   0,
-0x94,0xFF,0xFF,0x19,   0,   0,   0,0x2F,0xDD,0xFF,0xFF,0xFF,0xFF,0xFF,0xDF,0x14,   0,
-   0,0x11,0x2C,   0,   0,   0,   0,   0,0x0B,0x7A,0xD3,0xF7,0xEC,0xA0,0x19,   0,   0,
+   0,   0,0x1B,0x93,0xDF,0xF8,0xE1,0xAA,0x46,   0,   0,   0,   0,   0,   0,0x65,0x34,
+   0,0x50,0xF2,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xCC,0x5F,0x1D,0x09,0x3A,0xAD,0xFF,0x38,
+   0,0xC0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x38,
+   0,0xC0,0xE5,0x69,0x1C,0x08,0x28,0x6E,0xDA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB3,0x0C,
+   0,0x7C,0x0F,   0,   0,   0,   0,   0,0x02,0x51,0xB7,0xEC,0xF3,0xC3,0x5B,0x01,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -3857,24 +3368,20 @@
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
 // '!'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xB4,0xFF,0x20,   0,   0,
+   0,   0,   0,0xB4,0xFF,0x20,   0,   0,
+   0,   0,   0,0xB4,0xFF,0x20,   0,   0,
+   0,   0,   0,0xB4,0xFF,0x20,   0,   0,
+   0,   0,   0,0xB1,0xFF,0x1D,   0,   0,
+   0,   0,   0,0x9B,0xFF,0x09,   0,   0,
+   0,   0,   0,0x81,0xF3,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0xC2,0xFF,0x28,   0,   0,
-   0,   0,   0,0xBD,0xFF,0x24,   0,   0,
-   0,   0,   0,0xB9,0xFF,0x20,   0,   0,
-   0,   0,   0,0xB5,0xFF,0x1C,   0,   0,
-   0,   0,   0,0xB1,0xFF,0x18,   0,   0,
-   0,   0,   0,0xAD,0xFF,0x14,   0,   0,
-   0,   0,   0,0x94,0xDF,0x0F,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x0B,0x1C,   0,   0,   0,
-   0,   0,   0,0xC7,0xFC,0x2F,   0,   0,
-   0,   0,   0,0xA8,0xE9,0x21,   0,   0,
+   0,   0,   0,0xB4,0xFF,0x20,   0,   0,
+   0,   0,   0,0xB4,0xFF,0x20,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -3883,12 +3390,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,0x13,0xFF,0x53,0x43,0xFF,0x23,   0,
-   0,0x13,0xFF,0x47,0x43,0xFF,0x17,   0,
-   0,0x13,0xFF,0x36,0x43,0xFF,0x08,   0,
-   0,0x10,0xD3,0x20,0x38,0xCF,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
+   0,0x6C,0xFF,0x54,   0,0xEC,0xD4,   0,
+   0,0x6C,0xFF,0x54,   0,0xEC,0xD4,   0,
+   0,0x6C,0xFF,0x54,   0,0xEC,0xD4,   0,
+   0,0x6C,0xFF,0x54,   0,0xEC,0xD4,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -3903,18 +3408,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,0x01,0xF4,0x3D,0x61,0xD8,   0,
-   0,   0,0x22,0xFF,0x13,0x8C,0xAC,   0,
-   0,   0,0x4E,0xE8,   0,0xB6,0x81,   0,
-0x33,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE7,
-0x0C,0x3F,0xBB,0xAB,0x4C,0xFF,0x60,0x39,
-   0,   0,0xC2,0x72,0x2C,0xFF,0x0D,   0,
-0x02,0x03,0xE3,0x56,0x4F,0xEC,0x03,0x01,
-0xB7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x63,
-0x25,0x62,0xFB,0x36,0xB5,0xAB,0x33,0x14,
-   0,0x63,0xD3,   0,0xCB,0x6B,   0,   0,
-   0,0x91,0xA6,0x02,0xF6,0x3E,   0,   0,
+   0,   0,   0,0xCC,0xB8,   0,0xE4,0xA2,
+   0,   0,0x08,0xFA,0x81,0x1A,0xFF,0x69,
+   0,   0,0x39,0xFF,0x4B,0x51,0xFF,0x30,
+0x34,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+   0,   0,0xD5,0xAE,0x01,0xEB,0x97,   0,
+   0,0x15,0xFE,0x6C,0x2C,0xFF,0x57,   0,
+0xFC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x9C,
+   0,0xB0,0xD4,   0,0xC4,0xBF,   0,   0,
+   0,0xE6,0x9D,0x04,0xF5,0x87,   0,   0,
+0x1D,0xFF,0x67,0x31,0xFF,0x4F,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -3922,39 +3425,35 @@
 // '$'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0xF7,0x1F,   0,   0,
-   0,   0,0x07,0x4A,0xFB,0x60,0x06,   0,
-   0,0x12,0xD2,0xFF,0xFF,0xFF,0xCA,0x0E,
-   0,0x8A,0xFF,0x9C,0x38,0xAD,0xFF,0x7A,
-   0,0xB5,0xFF,0x2D,   0,0x2E,0xFF,0xB4,
-   0,0x94,0xFF,0x9B,0x07,   0,0x03,0x03,
-   0,0x1F,0xEB,0xFF,0xE8,0x77,0x09,   0,
-   0,   0,0x1A,0x9F,0xF9,0xFF,0xD7,0x14,
-   0,   0,   0,   0,0x19,0xB1,0xFF,0x8F,
-0x0C,0xD7,0xB7,   0,   0,0x25,0xFF,0xBF,
-   0,0xDF,0xFD,0x4D,0x06,0x74,0xFF,0xA2,
-   0,0x4E,0xFA,0xFF,0xFF,0xFF,0xF0,0x2B,
-   0,   0,0x2A,0x8B,0xFE,0x78,0x1D,   0,
-   0,   0,   0,0x1B,0xFB,   0,   0,   0,
+   0,   0,   0,0x38,0xC0,   0,   0,   0,
+   0,   0,   0,0x38,0xC0,   0,   0,   0,
+   0,0x18,0xAB,0xF0,0xFF,0xFF,0xD4,   0,
+   0,0xAB,0xFD,0x66,0xC2,0x38,0x95,   0,
+   0,0xD3,0xFD,0x55,0xC0,   0,   0,   0,
+   0,0x81,0xFF,0xFB,0xE9,0x76,0x0E,   0,
+   0,   0,0x56,0xBA,0xFF,0xFF,0xD7,0x09,
+   0,   0,   0,0x38,0xC1,0xA5,0xFF,0x59,
+   0,0x68,   0,0x38,0xC0,0x67,0xFF,0x6A,
+   0,0xD4,0x95,0x4A,0xC3,0xAB,0xFB,0x29,
+   0,0x2F,0xAC,0xEE,0xFE,0xD6,0x51,   0,
+   0,   0,   0,0x38,0xC0,   0,   0,   0,
+   0,   0,   0,0x38,0xC0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
 // '%'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-0x26,0xD1,0xEC,0x69,   0,   0,   0,   0,
-0xA0,0xBF,0x74,0xF5,0x06,0x3A,0x25,   0,
-0xC2,0x88,0x28,0xFF,0x20,0xD1,0x67,   0,
-0xAC,0xA9,0x4B,0xFD,0x62,0xDC,0x04,   0,
-0x3A,0xF4,0xFF,0x93,0xD8,0x59,   0,   0,
-   0,0x0B,0x1A,0x61,0xD0,0x01,   0,   0,
-   0,   0,0x05,0xDF,0x71,0xD2,0xEE,0x72,
-   0,   0,0x6A,0xC3,0x9E,0xBE,0x6A,0xFA,
-   0,0x02,0xE0,0x3D,0xBA,0x8C,0x20,0xFF,
-   0,   0,0x15,   0,0x9F,0xBE,0x5E,0xFB,
-   0,   0,   0,   0,0x26,0xD1,0xEF,0x75,
+0x20,0xC4,0xF4,0xAD,0x0B,   0,   0,   0,
+0xA9,0xAA,0x11,0xD3,0x79,   0,   0,   0,
+0xAA,0xA9,0x10,0xD2,0x79,   0,   0,   0,
+0x21,0xC6,0xF4,0xAF,0x0C,0x0A,0x6F,0x8F,
+   0,   0,   0,0x0D,0x77,0x9D,0x37,   0,
+   0,0x11,0x7D,0x99,0x2F,   0,   0,   0,
+0x2F,0x94,0x28,   0,0x47,0xDD,0xEE,0x7C,
+   0,   0,   0,   0,0xE9,0x6A,0x2A,0xFB,
+   0,   0,   0,   0,0xEA,0x68,0x28,0xFB,
+   0,   0,   0,   0,0x49,0xDE,0xEF,0x80,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -3963,18 +3462,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,0x73,0xE2,0xE8,0x6B,   0,   0,
-   0,0x41,0xFF,0xDA,0xD5,0xFD,0x25,   0,
-   0,0x82,0xFF,0x38,0x41,0xFF,0x55,   0,
-   0,0x79,0xFF,0x51,0x94,0xFC,0x24,   0,
-   0,0x27,0xFD,0xF5,0xFD,0x67,   0,   0,
-   0,0x21,0xE9,0xFF,0xA4,   0,0x1E,0x43,
-0x0C,0xE0,0xF5,0xDF,0xFC,0x3C,0x87,0xFF,
-0x60,0xFF,0x89,0x33,0xFA,0xE1,0xD6,0xF0,
-0x6B,0xFF,0x83,   0,0x75,0xFF,0xFF,0x8E,
-0x28,0xFA,0xF6,0x9E,0xC8,0xFF,0xFF,0x6E,
-   0,0x4D,0xD2,0xF8,0xDE,0x80,0xEF,0xF5,
+   0,0x02,0x89,0xE4,0xF6,0x9A,0x09,   0,
+   0,0x59,0xFF,0x9A,0x0C,0x5D,0x45,   0,
+   0,0x6E,0xFF,0x9F,   0,   0,   0,   0,
+   0,0x1B,0xF7,0xF7,0x1F,   0,   0,   0,
+   0,0x8A,0xFF,0xFF,0xB2,   0,   0,   0,
+0x5B,0xFF,0xA9,0xBF,0xFF,0x55,0x45,0xFF,
+0xAF,0xFF,0x2E,0x2B,0xFB,0xE7,0x65,0xFF,
+0xA6,0xFF,0x36,   0,0x8D,0xFF,0xF7,0xEF,
+0x47,0xFE,0xC1,0x1C,0x2D,0xFC,0xFF,0x85,
+   0,0x51,0xCD,0xF6,0xF1,0xC4,0xF5,0xE5,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -3983,12 +3480,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,0xDF,0x97,   0,   0,   0,
-   0,   0,   0,0xDF,0x8F,   0,   0,   0,
-   0,   0,   0,0xDF,0x7C,   0,   0,   0,
-   0,   0,   0,0xD1,0x65,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xAC,0xFF,0x14,   0,   0,
+   0,   0,   0,0xAC,0xFF,0x14,   0,   0,
+   0,   0,   0,0xAC,0xFF,0x14,   0,   0,
+   0,   0,   0,0xAC,0xFF,0x14,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4002,56 +3497,50 @@
 // '('
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,0x8D,0xF6,0x18,   0,
+   0,   0,   0,0x2B,0xFC,0x92,   0,   0,
+   0,   0,   0,0xA0,0xFF,0x2F,   0,   0,
+   0,   0,0x06,0xF5,0xE1,   0,   0,   0,
+   0,   0,0x39,0xFF,0xAD,   0,   0,   0,
+   0,   0,0x55,0xFF,0x95,   0,   0,   0,
+   0,   0,0x56,0xFF,0x95,   0,   0,   0,
+   0,   0,0x3A,0xFF,0xAE,   0,   0,   0,
+   0,   0,0x07,0xF7,0xE2,   0,   0,   0,
+   0,   0,   0,0xA3,0xFF,0x30,   0,   0,
+   0,   0,   0,0x2D,0xFC,0x93,   0,   0,
+   0,   0,   0,   0,0x8D,0xF6,0x18,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x2C,0xCB,0x06,   0,
-   0,   0,   0,0x15,0xE6,0x9A,   0,   0,
-   0,   0,   0,0x9E,0xE5,0x0A,   0,   0,
-   0,   0,0x13,0xF9,0x83,   0,   0,   0,
-   0,   0,0x55,0xFF,0x3F,   0,   0,   0,
-   0,   0,0x87,0xFF,0x17,   0,   0,   0,
-   0,   0,0x9B,0xFF,0x06,   0,   0,   0,
-   0,   0,0x9C,0xFF,0x04,   0,   0,   0,
-   0,   0,0x88,0xFF,0x12,   0,   0,   0,
-   0,   0,0x59,0xFF,0x36,   0,   0,   0,
-   0,   0,0x16,0xFB,0x7D,   0,   0,   0,
-   0,   0,   0,0xA5,0xE0,0x06,   0,   0,
-   0,   0,   0,0x1B,0xED,0x8C,   0,   0,
-   0,   0,   0,   0,0x36,0xD9,0x07,   0,
-   0,   0,   0,   0,   0,0x03,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,
 // ')'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xA3,0xE9,0x12,   0,   0,   0,
+   0,   0,0x25,0xFE,0x97,   0,   0,   0,
+   0,   0,   0,0xC0,0xF8,0x17,   0,   0,
+   0,   0,   0,0x72,0xFF,0x6B,   0,   0,
+   0,   0,   0,0x3D,0xFF,0xA8,   0,   0,
+   0,   0,   0,0x25,0xFF,0xC4,   0,   0,
+   0,   0,   0,0x26,0xFF,0xC4,   0,   0,
+   0,   0,   0,0x3E,0xFF,0xA8,   0,   0,
+   0,   0,   0,0x73,0xFF,0x6B,   0,   0,
+   0,   0,   0,0xC1,0xF8,0x17,   0,   0,
+   0,   0,0x26,0xFE,0x98,   0,   0,   0,
+   0,   0,0xA3,0xEA,0x12,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0xA2,0x5E,   0,   0,   0,   0,
-   0,   0,0x50,0xFD,0x4F,   0,   0,   0,
-   0,   0,   0,0xA8,0xE8,0x09,   0,   0,
-   0,   0,   0,0x3E,0xFF,0x66,   0,   0,
-   0,   0,   0,0x01,0xF3,0xAF,   0,   0,
-   0,   0,   0,   0,0xCE,0xE2,   0,   0,
-   0,   0,   0,   0,0xBB,0xF9,   0,   0,
-   0,   0,   0,   0,0xBA,0xF9,   0,   0,
-   0,   0,   0,   0,0xCB,0xE4,   0,   0,
-   0,   0,   0,   0,0xF0,0xB3,   0,   0,
-   0,   0,   0,0x33,0xFF,0x6B,   0,   0,
-   0,   0,   0,0x9A,0xED,0x0C,   0,   0,
-   0,   0,0x45,0xFC,0x58,   0,   0,   0,
-   0,   0,0xAC,0x6C,   0,   0,   0,   0,
-   0,   0,0x03,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,
 // '*'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x64,0xC8,   0,   0,   0,
+0x08,0xC9,0x68,0x69,0xC8,0x35,0xB6,0x55,
+   0,0x38,0xB6,0xF9,0xFA,0xE1,0x6B,0x07,
+   0,0x38,0xB5,0xF8,0xF9,0xE1,0x6A,0x07,
+0x08,0xC9,0x67,0x69,0xC8,0x33,0xB6,0x55,
+   0,   0,   0,0x64,0xC8,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x22,0xFF,0x44,   0,   0,   0,
-0x01,   0,0x0F,0xFF,0x2F,   0,   0,   0,
-0xA6,0x99,0x24,0xFB,0x2C,0x7F,0xAB,   0,
-0x7E,0xCB,0xF9,0xFE,0xF6,0xE5,0xA1,0x01,
-   0,   0,0x9B,0xF8,0xA8,   0,   0,   0,
-   0,0x61,0xF7,0x41,0xF9,0x5B,   0,   0,
-0x07,0xDC,0x88,   0,0x92,0xDF,0x06,   0,
-   0,0x12,0x0E,   0,0x15,0x1B,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4064,16 +3553,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,0x92,0xB3,   0,   0,   0,
-   0,   0,   0,0xCF,0xFF,   0,   0,   0,
-   0,   0,   0,0xCF,0xFF,   0,   0,   0,
-0x46,0xD7,0xD7,0xF8,0xFF,0xD7,0xD7,0x6B,
-0x53,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7F,
-   0,   0,   0,0xCF,0xFF,   0,   0,   0,
-   0,   0,   0,0xCF,0xFF,   0,   0,   0,
-   0,   0,   0,0xCF,0xFF,   0,   0,   0,
+   0,   0,   0,0x98,0xFF,0x08,   0,   0,
+   0,   0,   0,0x98,0xFF,0x08,   0,   0,
+   0,   0,   0,0x98,0xFF,0x08,   0,   0,
+0x8C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF8,
+0x8C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF8,
+   0,   0,   0,0x98,0xFF,0x08,   0,   0,
+   0,   0,   0,0x98,0xFF,0x08,   0,   0,
+   0,   0,   0,0x98,0xFF,0x08,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4090,15 +3577,13 @@
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xD8,0xFF,0x4C,   0,   0,
+   0,   0,   0,0xDC,0xFF,0x43,   0,   0,
+   0,   0,0x18,0xFE,0xCD,0x02,   0,   0,
+   0,   0,0x62,0xFF,0x3D,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0xEB,0xDB,   0,   0,   0,
-   0,   0,   0,0xED,0xD9,   0,   0,   0,
-   0,   0,0x0A,0xFE,0xB7,   0,   0,   0,
-   0,   0,0x49,0xFF,0x55,   0,   0,   0,
-   0,   0,0x25,0x79,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
 // '-'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4108,10 +3593,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,   0,   0,   0,   0,   0,
-   0,0x0C,0x9F,0x9F,0x9F,0x9F,0x9F,0x63,
-   0,0x13,0xFF,0xFF,0xFF,0xFF,0xFF,0x9F,
-   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0xF0,0xFF,0xFF,0xFF,0x60,   0,
+   0,   0,0xF0,0xFF,0xFF,0xFF,0x60,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4130,11 +3613,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,0x5E,0x8C,0x11,   0,   0,
-   0,   0,0x0F,0xFE,0xFF,0x78,   0,   0,
-   0,   0,0x02,0xBF,0xEE,0x3D,   0,   0,
+   0,   0,   0,0xF0,0xFF,0x58,   0,   0,
+   0,   0,   0,0xF0,0xFF,0x58,   0,   0,
+   0,   0,   0,0xF0,0xFF,0x58,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4143,38 +3624,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,
-   0,   0,   0,   0,0x03,0xEA,0xD6,   0,
-   0,   0,   0,   0,0x41,0xFF,0x83,   0,
-   0,   0,   0,   0,0x94,0xFF,0x30,   0,
-   0,   0,   0,0x01,0xE5,0xDD,   0,   0,
-   0,   0,   0,0x3A,0xFF,0x8A,   0,   0,
-   0,   0,   0,0x8E,0xFF,0x37,   0,   0,
-   0,   0,   0,0xE0,0xE3,0x01,   0,   0,
-   0,   0,0x34,0xFF,0x91,   0,   0,   0,
-   0,   0,0x87,0xFF,0x3E,   0,   0,   0,
-   0,   0,0xDA,0xE9,0x02,   0,   0,   0,
-   0,0x2E,0xFF,0x99,   0,   0,   0,   0,
-   0,0x34,0x7B,0x2C,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,0x1B,0xFA,0x6E,
+   0,   0,   0,   0,   0,0x88,0xEF,0x0C,
+   0,   0,   0,   0,0x0C,0xEF,0x88,   0,
+   0,   0,   0,   0,0x6E,0xFA,0x1B,   0,
+   0,   0,   0,0x02,0xDD,0xA3,   0,   0,
+   0,   0,   0,0x53,0xFF,0x31,   0,   0,
+   0,   0,   0,0xC6,0xBE,   0,   0,   0,
+   0,   0,0x38,0xFF,0x4B,   0,   0,   0,
+   0,   0,0xAB,0xD7,0x01,   0,   0,   0,
+   0,0x20,0xFC,0x66,   0,   0,   0,   0,
+   0,0x90,0xEA,0x08,   0,   0,   0,   0,
+0x0F,0xF3,0x81,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
 // '0'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x7C,0xE7,0xF7,0xB4,0x1E,   0,
-   0,0x68,0xFF,0xDD,0xB9,0xFF,0xD1,0x01,
-   0,0xCD,0xFD,0x1D,   0,0xB6,0xFF,0x35,
-   0,0xF2,0xE7,   0,   0,0x88,0xFF,0x59,
-0x07,0xFF,0xDF,   0,0x5F,0xF7,0xFF,0x6F,
-0x07,0xFF,0xE3,0x90,0xE7,0xAE,0xFF,0x6F,
-0x07,0xFF,0xFF,0xC8,0x1B,0x77,0xFF,0x6F,
-   0,0xF2,0xEE,0x07,   0,0x81,0xFF,0x59,
-   0,0xCC,0xFD,0x19,   0,0xB0,0xFF,0x33,
-   0,0x5D,0xFF,0xD8,0xAF,0xFF,0xC7,   0,
-   0,   0,0x71,0xE8,0xF8,0xB5,0x17,   0,
+   0,0x01,0x81,0xE7,0xF7,0xBD,0x25,   0,
+   0,0x6F,0xFF,0x80,0x26,0xF0,0xD9,0x04,
+   0,0xD9,0xFF,0x10,   0,0xA3,0xFF,0x48,
+0x0D,0xFF,0xEE,   0,   0,0x80,0xFF,0x7C,
+0x22,0xFF,0xE2,0x6B,0xD3,0x74,0xFF,0x92,
+0x23,0xFF,0xE2,0x6D,0xD5,0x74,0xFF,0x91,
+0x0D,0xFF,0xEE,   0,   0,0x80,0xFF,0x7C,
+   0,0xD9,0xFF,0x10,   0,0xA3,0xFF,0x49,
+   0,0x6F,0xFF,0x80,0x26,0xF0,0xDB,0x05,
+   0,0x01,0x82,0xE8,0xF8,0xBE,0x26,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4183,18 +3660,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,0x2C,0x4C,   0,   0,
-   0,0x0F,0x67,0xC9,0xFF,0x9F,   0,   0,
-   0,0xCD,0xFF,0xFC,0xFF,0x9F,   0,   0,
-   0,0x92,0x5A,0x54,0xFF,0x9F,   0,   0,
-   0,   0,   0,0x4B,0xFF,0x9F,   0,   0,
-   0,   0,   0,0x4B,0xFF,0x9F,   0,   0,
-   0,   0,   0,0x4B,0xFF,0x9F,   0,   0,
-   0,   0,   0,0x4B,0xFF,0x9F,   0,   0,
-   0,   0,   0,0x4B,0xFF,0x9F,   0,   0,
-   0,   0,   0,0x4B,0xFF,0x9F,   0,   0,
-   0,   0,   0,0x4B,0xFF,0x9F,   0,   0,
+   0,0x13,0x80,0xED,0xFF,0x80,   0,   0,
+   0,0x7C,0x7F,0x86,0xFF,0x80,   0,   0,
+   0,   0,   0,0x74,0xFF,0x80,   0,   0,
+   0,   0,   0,0x74,0xFF,0x80,   0,   0,
+   0,   0,   0,0x74,0xFF,0x80,   0,   0,
+   0,   0,   0,0x74,0xFF,0x80,   0,   0,
+   0,   0,   0,0x74,0xFF,0x80,   0,   0,
+   0,   0,   0,0x74,0xFF,0x80,   0,   0,
+   0,   0,   0,0x74,0xFF,0x80,   0,   0,
+   0,0xB8,0xFF,0xFF,0xFF,0xFF,0xFF,0xC4,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4203,18 +3678,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,0x14,0xA3,0xF2,0xE9,0xA1,0x13,   0,
-0x04,0xD0,0xFF,0xCD,0xDD,0xFF,0xAF,   0,
-0x51,0xFF,0xA3,   0,0x07,0xE5,0xFC,0x07,
-0x3F,0x87,0x39,   0,   0,0xC9,0xFF,0x12,
-   0,   0,   0,   0,0x2A,0xFC,0xD6,   0,
-   0,   0,   0,0x08,0xCE,0xFF,0x52,   0,
-   0,   0,0x01,0xA8,0xFF,0x91,   0,   0,
-   0,   0,0x83,0xFF,0xB6,0x03,   0,   0,
-   0,0x5C,0xFF,0xD0,0x0C,   0,   0,   0,
-0x2C,0xF8,0xFF,0xB9,0x9F,0x9F,0x9F,0x4A,
-0x4F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x77,
+   0,0x41,0xBA,0xF6,0xE6,0xA2,0x1A,   0,
+   0,0xBD,0x41,0x08,0x49,0xFC,0xCF,0x02,
+   0,   0,   0,   0,   0,0xD8,0xFF,0x29,
+   0,   0,   0,   0,0x0C,0xF8,0xFF,0x27,
+   0,   0,   0,   0,0x8A,0xFF,0xD9,0x02,
+   0,   0,   0,0x4D,0xFE,0xFA,0x3D,   0,
+   0,   0,0x2B,0xF2,0xFD,0x59,   0,   0,
+   0,0x13,0xDD,0xFF,0x67,   0,   0,   0,
+0x05,0xC1,0xFF,0x72,   0,   0,   0,   0,
+0x37,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x44,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4223,18 +3696,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,0x1B,0xA6,0xEA,0xEE,0xB6,0x2C,   0,
-0x01,0xCF,0xFF,0xC8,0xBD,0xFF,0xE4,0x0B,
-0x1E,0xD3,0xA9,   0,   0,0xAF,0xFF,0x41,
-   0,   0,   0,   0,   0,0xB0,0xFF,0x3D,
-   0,   0,0x12,0x94,0xB4,0xFF,0xAF,0x01,
-   0,   0,0x1F,0xFF,0xFF,0xFD,0x69,   0,
-   0,   0,   0,   0,0x20,0xD0,0xFF,0x38,
-0x09,0x1B,0x10,   0,   0,0x74,0xFF,0x75,
-0x45,0xFF,0xBB,   0,   0,0x95,0xFF,0x65,
-0x07,0xD4,0xFF,0xBE,0xB0,0xFE,0xE3,0x10,
-   0,0x1D,0xA8,0xEC,0xEC,0xB0,0x28,   0,
+   0,0x30,0xAF,0xF4,0xED,0xBB,0x38,   0,
+   0,0xA7,0x4D,0x09,0x32,0xF0,0xF2,0x12,
+   0,   0,   0,   0,   0,0xB6,0xFF,0x3B,
+   0,   0,   0,0x01,0x2F,0xEC,0xDF,0x0C,
+   0,   0,0x54,0xFF,0xFF,0xD7,0x29,   0,
+   0,   0,   0,0x01,0x33,0xE7,0xE9,0x18,
+   0,   0,   0,   0,   0,0x85,0xFF,0x6E,
+   0,   0,   0,   0,   0,0x7B,0xFF,0x6E,
+0x22,0xA6,0x37,0x0D,0x2B,0xDF,0xF5,0x25,
+0x01,0x57,0xC5,0xF2,0xEC,0xBC,0x3E,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4243,18 +3714,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,0xB1,0xFF,0x83,   0,
-   0,   0,   0,0x42,0xFF,0xFF,0x83,   0,
-   0,   0,0x02,0xD0,0xFF,0xFF,0x83,   0,
-   0,   0,0x65,0xFF,0xAD,0xFF,0x83,   0,
-   0,0x0D,0xE8,0xB6,0x63,0xFF,0x83,   0,
-   0,0x87,0xFA,0x27,0x63,0xFF,0x83,   0,
-0x20,0xF8,0x8D,   0,0x63,0xFF,0x83,   0,
-0x8B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xAB,
-0x58,0xA3,0xA3,0xA3,0xC7,0xFF,0xD3,0x6E,
-   0,   0,   0,   0,0x63,0xFF,0x83,   0,
-   0,   0,   0,   0,0x63,0xFF,0x83,   0,
+   0,   0,   0,0x04,0xC8,0xFF,0xAC,   0,
+   0,   0,   0,0x88,0xFF,0xFF,0xAC,   0,
+   0,   0,0x44,0xFE,0xC0,0xFF,0xAC,   0,
+   0,0x15,0xE7,0xD1,0x45,0xFF,0xAC,   0,
+0x01,0xB6,0xFB,0x31,0x40,0xFF,0xAC,   0,
+0x43,0xFF,0x81,   0,0x40,0xFF,0xAC,   0,
+0x4C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xCC,
+   0,   0,   0,   0,0x40,0xFF,0xAC,   0,
+   0,   0,   0,   0,0x40,0xFF,0xAC,   0,
+   0,   0,   0,   0,0x40,0xFF,0xAC,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4263,18 +3732,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,0x6D,0xFF,0xFF,0xFF,0xFF,0xFF,0x27,
-   0,0x86,0xFF,0xC1,0xB3,0xB3,0xB3,0x1C,
-   0,0x9F,0xFF,0x1D,   0,   0,   0,   0,
-   0,0xB8,0xFF,0x08,   0,   0,   0,   0,
-   0,0xD1,0xFD,0xCE,0xF4,0xC6,0x36,   0,
-   0,0xC5,0xF8,0xA0,0xB0,0xFF,0xEC,0x0E,
-   0,   0,0x0B,   0,   0,0xA2,0xFF,0x54,
-   0,0x03,0x02,   0,   0,0x73,0xFF,0x72,
-0x15,0xFF,0xD4,0x02,   0,0xA0,0xFF,0x54,
-   0,0xB0,0xFF,0xC7,0xAF,0xFF,0xE3,0x09,
-   0,0x0E,0x91,0xE4,0xF7,0xBC,0x23,   0,
+   0,0xB0,0xFF,0xFF,0xFF,0xFF,0xDC,   0,
+   0,0xB0,0xF4,   0,   0,   0,   0,   0,
+   0,0xB0,0xF4,   0,   0,   0,   0,   0,
+   0,0xB0,0xFE,0xF4,0xEC,0xAC,0x1C,   0,
+   0,0x86,0x44,0x0E,0x5A,0xFC,0xD7,0x07,
+   0,   0,   0,   0,   0,0xAA,0xFF,0x50,
+   0,   0,   0,   0,   0,0x85,0xFF,0x73,
+   0,   0,   0,   0,   0,0xA7,0xFF,0x57,
+0x03,0xAA,0x2D,0x0C,0x57,0xFA,0xDB,0x08,
+   0,0x49,0xC2,0xF3,0xE1,0x9B,0x17,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4283,18 +3750,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,0x08,0x7B,0xD6,0xF8,0x03,   0,
-   0,0x08,0xC3,0xFF,0xF1,0xBF,0x02,   0,
-   0,0x80,0xFF,0xB9,0x11,   0,   0,   0,
-0x02,0xE9,0xF5,0x17,   0,   0,   0,   0,
-0x27,0xFF,0xCF,0xAA,0xF6,0xDB,0x3E,   0,
-0x40,0xFF,0xFF,0xCA,0xBB,0xFF,0xF2,0x11,
-0x46,0xFF,0xC0,0x01,   0,0xA1,0xFF,0x5E,
-0x2D,0xFF,0xA9,   0,   0,0x69,0xFF,0x76,
-0x09,0xF1,0xE1,0x07,   0,0x9D,0xFF,0x52,
-   0,0x79,0xFF,0xD0,0xB3,0xFF,0xDD,0x07,
-   0,   0,0x79,0xE8,0xF7,0xB7,0x1F,   0,
+   0,   0,0x43,0xC2,0xF4,0xE1,0x65,   0,
+   0,0x3E,0xFB,0x9E,0x18,0x1E,0x9C,0x0B,
+   0,0xBB,0xF3,0x09,   0,   0,   0,   0,
+0x03,0xF7,0xEB,0xC6,0xF5,0xDF,0x6D,   0,
+0x15,0xFF,0xFF,0x90,0x13,0xC1,0xFF,0x40,
+0x17,0xFF,0xFF,0x26,   0,0x5C,0xFF,0x8E,
+0x06,0xFD,0xFF,0x11,   0,0x45,0xFF,0xA2,
+   0,0xD3,0xFF,0x26,   0,0x5B,0xFF,0x83,
+   0,0x6F,0xFF,0x90,0x12,0xC0,0xFB,0x26,
+   0,0x01,0x7E,0xE3,0xF7,0xCE,0x48,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4303,18 +3768,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,
-0x87,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x77,
-0x57,0xA3,0xA3,0xA3,0xA3,0xDB,0xFF,0x51,
-   0,   0,   0,   0,0x02,0xE0,0xE8,0x05,
-   0,   0,   0,   0,0x4D,0xFF,0x88,   0,
-   0,   0,   0,   0,0xB7,0xFF,0x25,   0,
-   0,   0,   0,0x23,0xFE,0xBF,   0,   0,
-   0,   0,   0,0x8B,0xFF,0x5B,   0,   0,
-   0,   0,0x08,0xEC,0xEE,0x08,   0,   0,
-   0,   0,0x5F,0xFF,0x92,   0,   0,   0,
-   0,   0,0xC9,0xFF,0x2E,   0,   0,   0,
-   0,0x32,0xFF,0xC9,   0,   0,   0,   0,
+0x14,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x60,
+   0,   0,   0,   0,0x0B,0xF4,0xFF,0x4D,
+   0,   0,   0,   0,0x5E,0xFF,0xE9,0x05,
+   0,   0,   0,   0,0xBD,0xFF,0x88,   0,
+   0,   0,   0,0x1D,0xFD,0xFE,0x23,   0,
+   0,   0,   0,0x7A,0xFF,0xBA,   0,   0,
+   0,   0,   0,0xD8,0xFF,0x53,   0,   0,
+   0,   0,0x38,0xFF,0xE7,0x05,   0,   0,
+   0,   0,0x96,0xFF,0x85,   0,   0,   0,
+   0,0x06,0xED,0xFE,0x21,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4323,18 +3786,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,0x11,0x9F,0xE9,0xEF,0xB1,0x22,   0,
-   0,0xAB,0xFF,0xCF,0xC3,0xFF,0xD3,   0,
-0x01,0xF4,0xF0,0x06,   0,0xCE,0xFF,0x22,
-   0,0xEE,0xF0,0x07,   0,0xCE,0xFE,0x1C,
-   0,0x6E,0xFF,0xCF,0xBF,0xFF,0x97,   0,
-   0,0x38,0xED,0xFF,0xFF,0xFB,0x5A,   0,
-0x07,0xE8,0xF1,0x2F,0x1E,0xD9,0xF8,0x1D,
-0x34,0xFF,0xB1,   0,   0,0x88,0xFF,0x5C,
-0x21,0xFF,0xD4,0x01,   0,0xAB,0xFF,0x56,
-0x01,0xC6,0xFF,0xC4,0xB4,0xFF,0xE2,0x0E,
-   0,0x18,0xA2,0xE9,0xEF,0xB5,0x29,   0,
+   0,0x0D,0x99,0xE7,0xF4,0xC7,0x40,   0,
+   0,0x9A,0xFF,0x4D,0x15,0xCD,0xF4,0x15,
+   0,0xD1,0xF4,   0,   0,0x89,0xFF,0x40,
+   0,0x8B,0xFF,0x4C,0x14,0xCE,0xEA,0x10,
+   0,0x08,0xC3,0xFF,0xFF,0xF8,0x47,   0,
+   0,0xA7,0xFC,0x46,0x15,0xC4,0xF2,0x22,
+0x0F,0xFF,0xC5,   0,   0,0x56,0xFF,0x7A,
+0x0B,0xFE,0xC5,   0,   0,0x57,0xFF,0x74,
+   0,0xBB,0xFC,0x46,0x15,0xC6,0xFA,0x2B,
+   0,0x18,0xA2,0xE7,0xF4,0xCA,0x4A,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4343,18 +3804,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,0x07,0x93,0xF1,0xEE,0x87,0x02,   0,
-   0,0xA3,0xFF,0xD0,0xD5,0xFF,0x8A,   0,
-0x1C,0xFE,0xDA,0x05,0x09,0xE4,0xF4,0x0D,
-0x48,0xFF,0x9A,   0,   0,0xA4,0xFF,0x34,
-0x43,0xFF,0xA3,   0,   0,0x95,0xFF,0x51,
-0x15,0xF8,0xF1,0x2F,0x23,0xE2,0xFF,0x4D,
-   0,0x83,0xFF,0xFF,0xFF,0xFC,0xFF,0x36,
-   0,   0,0x54,0x89,0x60,0xCC,0xF6,0x09,
-   0,   0,   0,   0,0x67,0xFF,0x9C,   0,
-   0,   0,0x9C,0xDC,0xFF,0xD9,0x15,   0,
-   0,   0,0xD6,0xDD,0x8C,0x11,   0,   0,
+   0,0x13,0xA4,0xEA,0xF3,0xB4,0x21,   0,
+   0,0xB5,0xFB,0x3B,0x32,0xF7,0xD5,0x03,
+0x15,0xFF,0xC6,   0,   0,0xBA,0xFF,0x3E,
+0x33,0xFF,0xB1,   0,   0,0xA5,0xFF,0x6E,
+0x1F,0xFF,0xC6,   0,   0,0xBA,0xFF,0x82,
+0x01,0xCE,0xFB,0x3A,0x31,0xF7,0xFF,0x80,
+   0,0x26,0xBF,0xF5,0xE7,0xC8,0xFF,0x66,
+   0,   0,   0,   0,   0,0x8D,0xFF,0x27,
+   0,0x73,0x3F,0x0C,0x4B,0xF2,0xA5,   0,
+   0,0x23,0xBC,0xF7,0xDF,0x85,0x06,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4366,15 +3825,13 @@
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x50,0x90,0x1A,   0,   0,
-   0,   0,   0,0xF5,0xFF,0x90,   0,   0,
-   0,   0,   0,0xAA,0xF2,0x50,   0,   0,
+   0,   0,   0,0xF0,0xFF,0x58,   0,   0,
+   0,   0,   0,0xF0,0xFF,0x58,   0,   0,
+   0,   0,   0,0xF0,0xFF,0x58,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x50,0x90,0x1A,   0,   0,
-   0,   0,   0,0xF5,0xFF,0x90,   0,   0,
-   0,   0,   0,0xAA,0xF2,0x50,   0,   0,
+   0,   0,   0,0xF0,0xFF,0x58,   0,   0,
+   0,   0,   0,0xF0,0xFF,0x58,   0,   0,
+   0,   0,   0,0xF0,0xFF,0x58,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4386,34 +3843,30 @@
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x2B,0x94,0x3C,   0,   0,
-   0,   0,   0,0xB1,0xFF,0xD4,   0,   0,
-   0,   0,   0,0x6B,0xF5,0x8C,   0,   0,
+   0,   0,   0,0xF0,0xFF,0x58,   0,   0,
+   0,   0,   0,0xF0,0xFF,0x58,   0,   0,
+   0,   0,   0,0xF0,0xFF,0x58,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0xF0,0xFF,0x58,   0,   0,
+   0,   0,   0,0xF3,0xFF,0x4F,   0,   0,
+   0,   0,0x21,0xFF,0xD7,0x04,   0,   0,
+   0,   0,0x5B,0xFF,0x49,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x67,0xFF,0x5F,   0,   0,
-   0,   0,   0,0x69,0xFF,0x5D,   0,   0,
-   0,   0,   0,0x85,0xFF,0x3B,   0,   0,
-   0,   0,   0,0xC5,0xD6,0x02,   0,   0,
-   0,   0,   0,0x6C,0x33,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
 // '<'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x02,0x4A,0x0E,
-   0,   0,   0,0x13,0x75,0xDE,0xFF,0x1B,
-   0,0x35,0xA0,0xF7,0xFF,0xDB,0x85,0x09,
-   0,0xEF,0xFF,0x9C,0x32,   0,   0,   0,
-   0,0xA6,0xFC,0xFA,0xB6,0x61,0x11,   0,
-   0,   0,0x1D,0x83,0xE8,0xFF,0xFA,0x18,
-   0,   0,   0,   0,0x05,0x58,0xC3,0x1B,
+   0,   0,   0,   0,   0,0x1F,0x7E,0xB2,
+   0,   0,0x09,0x5B,0xBC,0xFE,0xFE,0xA6,
+0x21,0x99,0xF1,0xFF,0xCA,0x72,0x1B,   0,
+0x64,0xFF,0xDF,0x3F,   0,   0,   0,   0,
+0x23,0x9E,0xF3,0xFE,0xC4,0x6D,0x19,   0,
+   0,   0,0x0B,0x5F,0xBF,0xFE,0xFD,0xA5,
+   0,   0,   0,   0,   0,0x21,0x80,0xB3,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4425,14 +3878,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,
+0x64,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD4,
+0x64,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD4,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x97,0xA3,0xA3,0xA3,0xA3,0xA3,0x59,
-   0,0xEB,0xFF,0xFF,0xFF,0xFF,0xFF,0x8B,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x97,0xA3,0xA3,0xA3,0xA3,0xA3,0x59,
-   0,0xEB,0xFF,0xFF,0xFF,0xFF,0xFF,0x8B,
+0x64,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD4,
+0x64,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD4,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4445,15 +3896,13 @@
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x53,0x09,   0,   0,   0,   0,   0,
-   0,0xE7,0xEE,0x8F,0x27,   0,   0,   0,
-   0,0x67,0xC2,0xFD,0xFF,0xBE,0x55,0x05,
-   0,   0,   0,0x19,0x72,0xF0,0xFF,0x3F,
-   0,0x06,0x4B,0xA1,0xF0,0xFF,0xD1,0x24,
-   0,0xDC,0xFF,0xF7,0xA1,0x39,   0,   0,
-   0,0xC0,0x71,0x12,   0,   0,   0,   0,
+0x5C,0xA9,0x48,0x02,   0,   0,   0,   0,
+0x46,0xED,0xFF,0xE4,0x86,0x26,   0,   0,
+   0,0x05,0x4C,0xA4,0xF3,0xFF,0xC4,0x59,
+   0,   0,   0,   0,0x10,0xA3,0xFF,0xD4,
+   0,0x04,0x48,0x9F,0xEF,0xFF,0xC8,0x5C,
+0x46,0xEC,0xFF,0xE6,0x89,0x28,   0,   0,
+0x5C,0xAA,0x4A,0x03,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4463,18 +3912,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,0x0B,0x7F,0xD9,0xF6,0xD4,0x5A,   0,
+   0,0x5B,0x79,0x1F,0x12,0xD2,0xFE,0x23,
+   0,   0,   0,   0,0x06,0xDB,0xFF,0x29,
+   0,   0,   0,0x04,0xAE,0xFF,0x86,   0,
+   0,   0,   0,0x90,0xFF,0x83,   0,   0,
+   0,   0,   0,0xE7,0xE9,0x01,   0,   0,
+   0,   0,   0,0xFC,0xD4,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x04,0x84,0xE0,0xF5,0xCF,0x54,   0,
-   0,0x81,0xFF,0xE5,0xB7,0xF8,0xFC,0x30,
-   0,0xC9,0xF7,0x22,   0,0x7C,0xFF,0x75,
-   0,   0,   0,   0,   0,0x85,0xFF,0x6B,
-   0,   0,   0,   0,0x2B,0xF2,0xF1,0x16,
-   0,   0,   0,0x1D,0xE6,0xF8,0x44,   0,
-   0,   0,   0,0x82,0xFF,0x62,   0,   0,
-   0,   0,   0,0x69,0xB3,0x17,   0,   0,
-   0,   0,   0,0x0A,0x20,   0,   0,   0,
-   0,   0,   0,0xBE,0xFE,0x3A,   0,   0,
-   0,   0,   0,0x9E,0xEC,0x29,   0,   0,
+   0,   0,   0,0xFC,0xD4,   0,   0,   0,
+   0,   0,   0,0xFC,0xD4,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4483,38 +3930,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,
-   0,   0,0x47,0xCB,0xF7,0xD4,0x49,   0,
-   0,0x4C,0xEC,0x5E,0x27,0x61,0xEF,0x2C,
-0x07,0xE6,0x4D,   0,   0,   0,0x6D,0x9A,
-0x54,0xD8,0x01,0x87,0xEE,0xC9,0x32,0xE4,
-0x92,0x97,0x46,0xEC,0x43,0xFF,0x18,0xFB,
-0xB0,0x77,0x98,0x93,0x1E,0xF5,0x12,0xF2,
-0xA8,0x77,0xBD,0x71,0x31,0xE2,0x26,0xD5,
-0x92,0x8E,0xB1,0x8F,0x53,0xD4,0x67,0x92,
-0x5B,0xDB,0x53,0xFB,0xC6,0xEC,0xE7,0x1A,
-0x06,0xD7,0xB4,0x45,0x22,0x40,0x09,   0,
-   0,0x1C,0xAC,0xF1,0xF6,0xA7,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x65,0xD1,0xF7,0xDD,0x75,0x01,
+   0,0x8B,0xE9,0x4B,0x09,0x3F,0xEF,0x69,
+0x36,0xFE,0x45,   0,   0,   0,0x8D,0xC9,
+0x9B,0xD2,   0,0x4F,0xDE,0xEF,0xCF,0xE9,
+0xD4,0x91,0x16,0xF4,0x80,0x12,0xC5,0xEC,
+0xEC,0x74,0x4E,0xFF,0x1A,   0,0x66,0xEC,
+0xEB,0x6F,0x4E,0xFF,0x19,   0,0x67,0xEC,
+0xCF,0x8E,0x15,0xF4,0x80,0x12,0xC5,0xEC,
+0x8E,0xD6,   0,0x4F,0xDE,0xF2,0xD2,0xEC,
+0x24,0xF8,0x5F,   0,   0,   0,   0,   0,
+   0,0x61,0xF6,0x74,0x16,0x13,0x72,0x71,
+   0,   0,0x3C,0xB3,0xED,0xF8,0xDD,0x78,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
 // 'A'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0xB2,0xFF,0x58,   0,   0,
-   0,   0,0x08,0xF5,0xFF,0xA2,   0,   0,
-   0,   0,0x4A,0xFF,0xFF,0xEA,0x02,   0,
-   0,   0,0x96,0xFF,0xB5,0xFF,0x36,   0,
-   0,   0,0xE1,0xEA,0x49,0xFF,0x80,   0,
-   0,0x2E,0xFF,0xA9,0x0C,0xFB,0xCB,   0,
-   0,0x7A,0xFF,0x68,   0,0xC7,0xFE,0x17,
-   0,0xC6,0xFF,0xFF,0xFF,0xFF,0xFF,0x5F,
-0x14,0xFD,0xEF,0xBB,0xBB,0xC7,0xFF,0xA9,
-0x5E,0xFF,0x99,   0,   0,0x09,0xF8,0xF0,
-0xAA,0xFF,0x58,   0,   0,   0,0xC0,0xFF,
+   0,   0,0x28,0xFF,0xFF,0x96,   0,   0,
+   0,   0,0x6E,0xFF,0xFE,0xDD,   0,   0,
+   0,   0,0xB5,0xFE,0xB4,0xFF,0x23,   0,
+   0,0x07,0xF5,0xD6,0x67,0xFF,0x6A,   0,
+   0,0x43,0xFF,0x9B,0x2C,0xFF,0xB0,   0,
+   0,0x8A,0xFF,0x61,0x01,0xEF,0xF1,0x04,
+   0,0xD0,0xFF,0xFF,0xFF,0xFF,0xFF,0x3D,
+0x18,0xFE,0xC1,   0,   0,0x56,0xFF,0x83,
+0x5E,0xFF,0x8D,   0,   0,0x20,0xFF,0xCA,
+0xA5,0xFF,0x59,   0,   0,   0,0xEA,0xFD,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4523,18 +3966,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,
-0x1F,0xFF,0xFF,0xFF,0xF5,0xD1,0x65,   0,
-0x1F,0xFF,0xEF,0xA7,0xB3,0xF4,0xFF,0x5F,
-0x1F,0xFF,0xCF,   0,   0,0x45,0xFF,0xC1,
-0x1F,0xFF,0xCF,   0,   0,0x24,0xFF,0xC4,
-0x1F,0xFF,0xD7,0x27,0x33,0xAB,0xFF,0x71,
-0x1F,0xFF,0xFF,0xFF,0xFF,0xFF,0xC7,0x07,
-0x1F,0xFF,0xDF,0x53,0x57,0x9C,0xFF,0xA3,
-0x1F,0xFF,0xCF,   0,   0,0x01,0xED,0xFB,
-0x1F,0xFF,0xCF,   0,   0,0x13,0xF8,0xEE,
-0x1F,0xFF,0xEE,0xA3,0xA8,0xE2,0xFF,0x99,
-0x1F,0xFF,0xFF,0xFF,0xFC,0xE0,0x8A,0x0B,
+0x24,0xFF,0xFF,0xFF,0xF6,0xD6,0x71,   0,
+0x24,0xFF,0xCC,   0,0x10,0xBD,0xFF,0x54,
+0x24,0xFF,0xCC,   0,   0,0x78,0xFF,0x84,
+0x24,0xFF,0xCC,   0,0x0E,0xB8,0xFE,0x45,
+0x24,0xFF,0xFF,0xFF,0xFF,0xF5,0x75,   0,
+0x24,0xFF,0xCC,   0,0x0E,0x9E,0xFF,0x6A,
+0x24,0xFF,0xCC,   0,   0,0x30,0xFF,0xD3,
+0x24,0xFF,0xCC,   0,   0,0x2C,0xFF,0xDC,
+0x24,0xFF,0xCC,   0,0x0C,0x93,0xFF,0x9A,
+0x24,0xFF,0xFF,0xFF,0xFC,0xE3,0x99,0x0D,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4543,18 +3984,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,0x01,0x7E,0xE2,0xF1,0xC1,0x39,   0,
-   0,0x86,0xFF,0xDE,0xBA,0xFA,0xF7,0x24,
-0x15,0xF8,0xE7,0x0F,   0,0x62,0xFF,0x91,
-0x53,0xFF,0x9A,   0,   0,0x16,0x9B,0x74,
-0x6E,0xFF,0x7F,   0,   0,   0,   0,   0,
-0x73,0xFF,0x7B,   0,   0,   0,   0,   0,
-0x6F,0xFF,0x7F,   0,   0,   0,   0,   0,
-0x57,0xFF,0x94,   0,   0,0x12,0x77,0x5A,
-0x18,0xFC,0xDA,0x05,   0,0x5E,0xFF,0x97,
-   0,0x93,0xFF,0xCF,0xAC,0xF7,0xF6,0x27,
-   0,0x04,0x84,0xE4,0xF2,0xC1,0x38,   0,
+   0,   0,0x22,0xA9,0xEC,0xEF,0xA0,0x0E,
+   0,0x17,0xE8,0xF1,0x3F,0x0F,0x5A,0x53,
+   0,0x8B,0xFF,0x89,   0,   0,   0,   0,
+   0,0xD0,0xFF,0x44,   0,   0,   0,   0,
+   0,0xED,0xFF,0x2E,   0,   0,   0,   0,
+   0,0xED,0xFF,0x2D,   0,   0,   0,   0,
+   0,0xD0,0xFF,0x44,   0,   0,   0,   0,
+   0,0x8B,0xFF,0x89,   0,   0,   0,   0,
+   0,0x17,0xE9,0xF3,0x4A,0x10,0x57,0x52,
+   0,   0,0x23,0xAA,0xED,0xF0,0x9F,0x0E,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4563,18 +4002,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,
-0x23,0xFF,0xFF,0xF9,0xD4,0x6F,0x02,   0,
-0x23,0xFF,0xEE,0xAE,0xE9,0xFF,0x9D,   0,
-0x23,0xFF,0xCB,   0,0x12,0xDA,0xFF,0x3C,
-0x23,0xFF,0xCB,   0,   0,0x64,0xFF,0x94,
-0x23,0xFF,0xCB,   0,   0,0x35,0xFF,0xBA,
-0x23,0xFF,0xCB,   0,   0,0x2C,0xFF,0xCB,
-0x23,0xFF,0xCB,   0,   0,0x35,0xFF,0xBC,
-0x23,0xFF,0xCB,   0,   0,0x60,0xFF,0x96,
-0x23,0xFF,0xCB,   0,0x0A,0xD2,0xFF,0x40,
-0x23,0xFF,0xED,0xA7,0xE1,0xFF,0xA1,   0,
-0x23,0xFF,0xFF,0xFC,0xDB,0x76,0x03,   0,
+0x10,0xFF,0xFF,0xF9,0xDD,0x94,0x16,   0,
+0x10,0xFF,0xF4,0x07,0x51,0xF6,0xDB,0x0C,
+0x10,0xFF,0xF4,   0,   0,0x98,0xFF,0x6C,
+0x10,0xFF,0xF4,   0,   0,0x62,0xFF,0xAB,
+0x10,0xFF,0xF4,   0,   0,0x50,0xFF,0xC4,
+0x10,0xFF,0xF4,   0,   0,0x51,0xFF,0xC4,
+0x10,0xFF,0xF4,   0,   0,0x63,0xFF,0xAB,
+0x10,0xFF,0xF4,   0,   0,0x98,0xFF,0x6C,
+0x10,0xFF,0xF4,0x07,0x50,0xF6,0xDC,0x0C,
+0x10,0xFF,0xFF,0xF9,0xDE,0x95,0x17,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4583,18 +4020,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,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xAF,
-   0,0xFF,0xFA,0xA7,0xA7,0xA7,0xA7,0x73,
-   0,0xFF,0xEF,   0,   0,   0,   0,   0,
-   0,0xFF,0xEF,   0,   0,   0,   0,   0,
-   0,0xFF,0xEF,   0,   0,   0,   0,   0,
-   0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x03,
-   0,0xFF,0xF9,0x9B,0x9B,0x9B,0x9B,0x02,
-   0,0xFF,0xEF,   0,   0,   0,   0,   0,
-   0,0xFF,0xEF,   0,   0,   0,   0,   0,
-   0,0xFF,0xFA,0xA3,0xA3,0xA3,0xA3,0x75,
-   0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB7,
+   0,0xD8,0xFF,0xFF,0xFF,0xFF,0xFF,0x80,
+   0,0xD8,0xFF,0x2C,   0,   0,   0,   0,
+   0,0xD8,0xFF,0x2C,   0,   0,   0,   0,
+   0,0xD8,0xFF,0x2C,   0,   0,   0,   0,
+   0,0xD8,0xFF,0xFF,0xFF,0xFF,0xFF,0x18,
+   0,0xD8,0xFF,0x2C,   0,   0,   0,   0,
+   0,0xD8,0xFF,0x2C,   0,   0,   0,   0,
+   0,0xD8,0xFF,0x2C,   0,   0,   0,   0,
+   0,0xD8,0xFF,0x2C,   0,   0,   0,   0,
+   0,0xD8,0xFF,0xFF,0xFF,0xFF,0xFF,0x80,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4603,18 +4038,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,0xFB,0xFF,0xFF,0xFF,0xFF,0xFF,0xBF,
-   0,0xFB,0xFB,0xA7,0xA7,0xA7,0xA7,0x7D,
-   0,0xFB,0xF3,   0,   0,   0,   0,   0,
-   0,0xFB,0xF3,   0,   0,   0,   0,   0,
-   0,0xFB,0xF3,   0,   0,   0,   0,   0,
-   0,0xFB,0xFF,0xFF,0xFF,0xFF,0xFF,0x37,
-   0,0xFB,0xFB,0xA7,0xA7,0xA7,0xA7,0x24,
-   0,0xFB,0xF3,   0,   0,   0,   0,   0,
-   0,0xFB,0xF3,   0,   0,   0,   0,   0,
-   0,0xFB,0xF3,   0,   0,   0,   0,   0,
-   0,0xFB,0xF3,   0,   0,   0,   0,   0,
+   0,0xC0,0xFF,0xFF,0xFF,0xFF,0xFF,0x9C,
+   0,0xC0,0xFF,0x44,   0,   0,   0,   0,
+   0,0xC0,0xFF,0x44,   0,   0,   0,   0,
+   0,0xC0,0xFF,0x44,   0,   0,   0,   0,
+   0,0xC0,0xFF,0xFF,0xFF,0xFF,0xFF,0x38,
+   0,0xC0,0xFF,0x44,   0,   0,   0,   0,
+   0,0xC0,0xFF,0x44,   0,   0,   0,   0,
+   0,0xC0,0xFF,0x44,   0,   0,   0,   0,
+   0,0xC0,0xFF,0x44,   0,   0,   0,   0,
+   0,0xC0,0xFF,0x44,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4623,18 +4056,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,0x76,0xE0,0xF2,0xC5,0x40,   0,
-   0,0x7C,0xFF,0xE6,0xBA,0xFA,0xF7,0x24,
-0x0B,0xF6,0xF5,0x1B,   0,0x68,0xFF,0x86,
-0x47,0xFF,0xAC,   0,   0,0x11,0x5F,0x42,
-0x61,0xFF,0x8C,   0,   0,   0,   0,   0,
-0x67,0xFF,0x87,   0,0x70,0x87,0x87,0x63,
-0x61,0xFF,0x8B,   0,0xD3,0xFF,0xFF,0xBB,
-0x4A,0xFF,0xA4,   0,   0,0x2F,0xFF,0xBB,
-0x0E,0xF8,0xE9,0x0F,   0,0x31,0xFF,0xBB,
-   0,0x86,0xFF,0xDF,0xA3,0xDC,0xFF,0xAB,
-   0,0x02,0x7C,0xE3,0xF9,0xDB,0x85,0x0E,
+   0,   0,0x40,0xC0,0xF4,0xEF,0x8E,0x0A,
+   0,0x41,0xFB,0xDA,0x2F,0x13,0x60,0x4F,
+   0,0xC9,0xFF,0x43,   0,   0,   0,   0,
+0x10,0xFF,0xFD,0x06,   0,   0,   0,   0,
+0x2D,0xFF,0xEC,   0,   0,   0,   0,   0,
+0x2D,0xFF,0xF1,   0,0x6C,0xFF,0xFF,0xB8,
+0x10,0xFE,0xFF,0x09,   0,0x08,0xFF,0xB8,
+   0,0xC8,0xFF,0x4B,   0,0x08,0xFF,0xB8,
+   0,0x41,0xFB,0xCE,0x1F,0x20,0xFF,0xB8,
+   0,   0,0x43,0xC4,0xF6,0xF3,0xD1,0x66,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4643,18 +4074,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,
-0x27,0xFF,0xBF,   0,   0,0x6F,0xFF,0x77,
-0x27,0xFF,0xBF,   0,   0,0x6F,0xFF,0x77,
-0x27,0xFF,0xBF,   0,   0,0x6F,0xFF,0x77,
-0x27,0xFF,0xBF,   0,   0,0x6F,0xFF,0x77,
-0x27,0xFF,0xBF,   0,   0,0x6F,0xFF,0x77,
-0x27,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x77,
-0x27,0xFF,0xE9,0xA7,0xA7,0xCE,0xFF,0x77,
-0x27,0xFF,0xBF,   0,   0,0x6F,0xFF,0x77,
-0x27,0xFF,0xBF,   0,   0,0x6F,0xFF,0x77,
-0x27,0xFF,0xBF,   0,   0,0x6F,0xFF,0x77,
-0x27,0xFF,0xBF,   0,   0,0x6F,0xFF,0x77,
+0x10,0xFF,0xF4,   0,   0,0x88,0xFF,0x80,
+0x10,0xFF,0xF4,   0,   0,0x88,0xFF,0x80,
+0x10,0xFF,0xF4,   0,   0,0x88,0xFF,0x80,
+0x10,0xFF,0xF4,   0,   0,0x88,0xFF,0x80,
+0x10,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x80,
+0x10,0xFF,0xF4,   0,   0,0x88,0xFF,0x80,
+0x10,0xFF,0xF4,   0,   0,0x88,0xFF,0x80,
+0x10,0xFF,0xF4,   0,   0,0x88,0xFF,0x80,
+0x10,0xFF,0xF4,   0,   0,0x88,0xFF,0x80,
+0x10,0xFF,0xF4,   0,   0,0x88,0xFF,0x80,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4663,18 +4092,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,0xAF,0xFF,0xFF,0xFF,0xFF,0xFF,0x13,
-   0,0x70,0xA3,0xEB,0xFF,0xB0,0xA3,0x0C,
-   0,   0,   0,0xC7,0xFF,0x23,   0,   0,
-   0,   0,   0,0xC7,0xFF,0x23,   0,   0,
-   0,   0,   0,0xC7,0xFF,0x23,   0,   0,
-   0,   0,   0,0xC7,0xFF,0x23,   0,   0,
-   0,   0,   0,0xC7,0xFF,0x23,   0,   0,
-   0,   0,   0,0xC7,0xFF,0x23,   0,   0,
-   0,   0,   0,0xC7,0xFF,0x23,   0,   0,
-   0,0x70,0xA3,0xEB,0xFF,0xB0,0xA3,0x0C,
-   0,0xAF,0xFF,0xFF,0xFF,0xFF,0xFF,0x13,
+   0,0xD4,0xFF,0xFF,0xFF,0xFF,0xFF,0x40,
+   0,   0,   0,0xCC,0xFF,0x38,   0,   0,
+   0,   0,   0,0xCC,0xFF,0x38,   0,   0,
+   0,   0,   0,0xCC,0xFF,0x38,   0,   0,
+   0,   0,   0,0xCC,0xFF,0x38,   0,   0,
+   0,   0,   0,0xCC,0xFF,0x38,   0,   0,
+   0,   0,   0,0xCC,0xFF,0x38,   0,   0,
+   0,   0,   0,0xCC,0xFF,0x38,   0,   0,
+   0,   0,   0,0xCC,0xFF,0x38,   0,   0,
+   0,0xD4,0xFF,0xFF,0xFF,0xFF,0xFF,0x40,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4683,18 +4110,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,0x67,0xFF,0x83,
-   0,   0,   0,   0,   0,0x67,0xFF,0x83,
-   0,   0,   0,   0,   0,0x67,0xFF,0x83,
-   0,   0,   0,   0,   0,0x67,0xFF,0x83,
-   0,   0,   0,   0,   0,0x67,0xFF,0x83,
-   0,   0,   0,   0,   0,0x67,0xFF,0x83,
-   0,   0,   0,   0,   0,0x67,0xFF,0x83,
-0x0E,0x43,0x2F,   0,   0,0x6B,0xFF,0x81,
-0x1A,0xFF,0xD0,   0,   0,0xA4,0xFF,0x5E,
-   0,0xC1,0xFF,0xC2,0xB9,0xFF,0xD8,0x08,
-   0,0x18,0xA3,0xE8,0xED,0xAB,0x1C,   0,
+   0,   0,0x98,0xFF,0xFF,0xFF,0xE4,   0,
+   0,   0,   0,   0,0x20,0xFF,0xE4,   0,
+   0,   0,   0,   0,0x20,0xFF,0xE4,   0,
+   0,   0,   0,   0,0x20,0xFF,0xE4,   0,
+   0,   0,   0,   0,0x20,0xFF,0xE4,   0,
+   0,   0,   0,   0,0x20,0xFF,0xE4,   0,
+   0,   0,   0,   0,0x20,0xFF,0xE4,   0,
+   0,   0,   0,   0,0x25,0xFF,0xDD,   0,
+0x3B,0x8C,0x28,0x09,0x7E,0xFF,0xAD,   0,
+0x04,0x65,0xCE,0xF8,0xEF,0xB5,0x1D,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4703,18 +4128,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,
-0x1F,0xFF,0xCF,   0,   0,0x35,0xFC,0xF8,
-0x1F,0xFF,0xCF,   0,0x05,0xD1,0xFF,0x76,
-0x1F,0xFF,0xCF,   0,0x7A,0xFF,0xC6,0x02,
-0x1F,0xFF,0xCF,0x27,0xF8,0xF5,0x25,   0,
-0x1F,0xFF,0xD2,0xC5,0xFF,0x6E,   0,   0,
-0x1F,0xFF,0xFF,0xFF,0xFF,0x77,   0,   0,
-0x1F,0xFF,0xFF,0xE8,0xFF,0xF2,0x17,   0,
-0x1F,0xFF,0xF1,0x28,0xA7,0xFF,0x9B,   0,
-0x1F,0xFF,0xCF,   0,0x1F,0xF7,0xFD,0x30,
-0x1F,0xFF,0xCF,   0,   0,0x85,0xFF,0xC0,
-0x1F,0xFF,0xCF,   0,   0,0x0C,0xE7,0xFF,
+0x34,0xFF,0xD0,   0,   0,0x6B,0xFF,0xCF,
+0x34,0xFF,0xD0,   0,0x3D,0xFA,0xE9,0x1E,
+0x34,0xFF,0xD0,0x1C,0xE8,0xF9,0x3C,   0,
+0x34,0xFF,0xD7,0xCA,0xFF,0x64,   0,   0,
+0x34,0xFF,0xFF,0xFF,0xFF,0x57,   0,   0,
+0x34,0xFF,0xFF,0xD4,0xFF,0xDD,0x06,   0,
+0x34,0xFF,0xE7,0x0F,0xBF,0xFF,0x71,   0,
+0x34,0xFF,0xD0,   0,0x37,0xFF,0xED,0x10,
+0x34,0xFF,0xD0,   0,   0,0xAD,0xFF,0x8B,
+0x34,0xFF,0xD0,   0,   0,0x28,0xFC,0xF8,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4723,18 +4146,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,0xF7,0xF3,   0,   0,   0,   0,   0,
-   0,0xF7,0xF3,   0,   0,   0,   0,   0,
-   0,0xF7,0xF3,   0,   0,   0,   0,   0,
-   0,0xF7,0xF3,   0,   0,   0,   0,   0,
-   0,0xF7,0xF3,   0,   0,   0,   0,   0,
-   0,0xF7,0xF3,   0,   0,   0,   0,   0,
-   0,0xF7,0xF3,   0,   0,   0,   0,   0,
-   0,0xF7,0xF3,   0,   0,   0,   0,   0,
-   0,0xF7,0xF3,   0,   0,   0,   0,   0,
-   0,0xF7,0xFB,0xA3,0xA3,0xA3,0xA3,0x63,
-   0,0xF7,0xFF,0xFF,0xFF,0xFF,0xFF,0x9B,
+   0,0x78,0xFF,0x90,   0,   0,   0,   0,
+   0,0x78,0xFF,0x90,   0,   0,   0,   0,
+   0,0x78,0xFF,0x90,   0,   0,   0,   0,
+   0,0x78,0xFF,0x90,   0,   0,   0,   0,
+   0,0x78,0xFF,0x90,   0,   0,   0,   0,
+   0,0x78,0xFF,0x90,   0,   0,   0,   0,
+   0,0x78,0xFF,0x90,   0,   0,   0,   0,
+   0,0x78,0xFF,0x90,   0,   0,   0,   0,
+   0,0x78,0xFF,0x90,   0,   0,   0,   0,
+   0,0x78,0xFF,0xFF,0xFF,0xFF,0xFF,0xE0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4743,18 +4164,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,
-0x1F,0xFF,0xFF,0x5C,   0,0xDD,0xFF,0xA7,
-0x1F,0xFF,0xFF,0x96,0x1E,0xFF,0xFF,0xA7,
-0x1F,0xFF,0xFF,0xD1,0x5F,0xFB,0xFF,0xA7,
-0x1F,0xFF,0xD6,0xFD,0xAF,0xC6,0xFF,0xA7,
-0x1F,0xFF,0x9D,0xFA,0xFE,0x84,0xFF,0xA7,
-0x1F,0xFF,0x95,0xC4,0xFF,0x42,0xFF,0xA7,
-0x1F,0xFF,0x99,0x82,0xE8,0x19,0xFF,0xA7,
-0x1F,0xFF,0x9E,0x1F,0x45,0x1B,0xFF,0xA7,
-0x1F,0xFF,0x9F,   0,   0,0x1B,0xFF,0xA7,
-0x1F,0xFF,0x9F,   0,   0,0x1B,0xFF,0xA7,
-0x1F,0xFF,0x9F,   0,   0,0x1B,0xFF,0xA7,
+0x68,0xFF,0xFF,0x25,   0,0xBA,0xFF,0xD8,
+0x68,0xFF,0xFF,0x70,0x0B,0xF8,0xFF,0xD8,
+0x68,0xFF,0xD6,0xBC,0x4E,0xEF,0xE6,0xD8,
+0x68,0xFF,0x92,0xFA,0xA6,0xAE,0xE4,0xD8,
+0x68,0xFF,0x59,0xF4,0xFE,0x6B,0xE4,0xD8,
+0x68,0xFF,0x54,0xB6,0xFF,0x29,0xE4,0xD8,
+0x68,0xFF,0x54,   0,   0,   0,0xE4,0xD8,
+0x68,0xFF,0x54,   0,   0,   0,0xE4,0xD8,
+0x68,0xFF,0x54,   0,   0,   0,0xE4,0xD8,
+0x68,0xFF,0x54,   0,   0,   0,0xE4,0xD8,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4763,18 +4182,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,
-0x27,0xFF,0xEF,0x09,   0,0x77,0xFF,0x73,
-0x27,0xFF,0xFF,0x5C,   0,0x77,0xFF,0x73,
-0x27,0xFF,0xFF,0xBF,   0,0x77,0xFF,0x73,
-0x27,0xFF,0xFF,0xFE,0x23,0x77,0xFF,0x73,
-0x27,0xFF,0xD5,0xF4,0x85,0x77,0xFF,0x73,
-0x27,0xFF,0xC7,0x9E,0xE5,0x7B,0xFF,0x73,
-0x27,0xFF,0xC7,0x39,0xFF,0xC4,0xFF,0x73,
-0x27,0xFF,0xC7,   0,0xD4,0xFF,0xFF,0x73,
-0x27,0xFF,0xC7,   0,0x70,0xFF,0xFF,0x73,
-0x27,0xFF,0xC7,   0,0x13,0xF8,0xFF,0x73,
-0x27,0xFF,0xC7,   0,   0,0xA6,0xFF,0x73,
+0x30,0xFF,0xFF,0x2D,   0,0x2C,0xFF,0x9C,
+0x30,0xFF,0xFF,0x92,   0,0x2C,0xFF,0x9C,
+0x30,0xFF,0xFC,0xEE,0x08,0x2C,0xFF,0x9C,
+0x30,0xFF,0xB6,0xFD,0x5A,0x2C,0xFF,0x9C,
+0x30,0xFF,0x98,0xB6,0xBE,0x2C,0xFF,0x9C,
+0x30,0xFF,0x98,0x51,0xFE,0x50,0xFF,0x9C,
+0x30,0xFF,0x98,0x04,0xE8,0xB3,0xFF,0x9C,
+0x30,0xFF,0x98,   0,0x88,0xFC,0xFF,0x9C,
+0x30,0xFF,0x98,   0,0x24,0xFE,0xFF,0x9C,
+0x30,0xFF,0x98,   0,   0,0xBE,0xFF,0x9C,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4783,18 +4200,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,0x04,0x8A,0xE7,0xF1,0xB0,0x20,   0,
-   0,0x96,0xFF,0xDF,0xC9,0xFF,0xDF,0x0C,
-0x19,0xFD,0xE3,0x0B,   0,0x9A,0xFF,0x72,
-0x56,0xFF,0x98,   0,   0,0x3B,0xFF,0xB7,
-0x6E,0xFF,0x82,   0,   0,0x20,0xFF,0xD1,
-0x73,0xFF,0x7F,   0,   0,0x1B,0xFF,0xD7,
-0x6F,0xFF,0x81,   0,   0,0x1F,0xFF,0xD1,
-0x57,0xFF,0x96,   0,   0,0x38,0xFF,0xB6,
-0x19,0xFC,0xDD,0x07,   0,0x92,0xFF,0x73,
-   0,0x94,0xFF,0xD4,0xB8,0xFE,0xE0,0x0C,
-   0,0x04,0x8A,0xE8,0xF2,0xB2,0x1F,   0,
+   0,0x07,0x90,0xE9,0xF6,0xC2,0x31,   0,
+   0,0x96,0xFF,0x6D,0x1F,0xE4,0xED,0x14,
+0x0F,0xF9,0xEE,0x01,   0,0x83,0xFF,0x74,
+0x42,0xFF,0xCB,   0,   0,0x5D,0xFF,0xAD,
+0x5A,0xFF,0xBE,   0,   0,0x4F,0xFF,0xC5,
+0x5A,0xFF,0xBE,   0,   0,0x4F,0xFF,0xC5,
+0x43,0xFF,0xCB,   0,   0,0x5D,0xFF,0xAE,
+0x0F,0xFA,0xEE,0x01,   0,0x83,0xFF,0x75,
+   0,0x96,0xFF,0x6B,0x1F,0xE2,0xED,0x14,
+   0,0x07,0x91,0xEB,0xF8,0xC3,0x32,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4803,18 +4218,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,0xFB,0xFF,0xFF,0xFC,0xD7,0x57,   0,
-   0,0xFB,0xFA,0xA7,0xB1,0xF3,0xFF,0x55,
-   0,0xFB,0xEF,   0,   0,0x3F,0xFF,0xC8,
-   0,0xFB,0xEF,   0,   0,0x02,0xFE,0xEC,
-   0,0xFB,0xEF,   0,   0,0x36,0xFF,0xCB,
-   0,0xFB,0xFA,0xA3,0xAC,0xF0,0xFF,0x59,
-   0,0xFB,0xFF,0xFF,0xF8,0xD0,0x5A,   0,
-   0,0xFB,0xEF,   0,   0,   0,   0,   0,
-   0,0xFB,0xEF,   0,   0,   0,   0,   0,
-   0,0xFB,0xEF,   0,   0,   0,   0,   0,
-   0,0xFB,0xEF,   0,   0,   0,   0,   0,
+   0,0xE4,0xFF,0xFF,0xF7,0xD8,0x81,0x02,
+   0,0xE4,0xFF,0x20,0x15,0xB3,0xFF,0x78,
+   0,0xE4,0xFF,0x20,   0,0x4D,0xFF,0xC2,
+   0,0xE4,0xFF,0x20,   0,0x4E,0xFF,0xC1,
+   0,0xE4,0xFF,0x20,0x14,0xB1,0xFF,0x78,
+   0,0xE4,0xFF,0xFF,0xF8,0xD9,0x82,0x02,
+   0,0xE4,0xFF,0x20,   0,   0,   0,   0,
+   0,0xE4,0xFF,0x20,   0,   0,   0,   0,
+   0,0xE4,0xFF,0x20,   0,   0,   0,   0,
+   0,0xE4,0xFF,0x20,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4823,38 +4236,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,
-   0,0x02,0x82,0xE3,0xF1,0xB3,0x24,   0,
-   0,0x8B,0xFF,0xE2,0xC7,0xFF,0xE1,0x10,
-0x11,0xF7,0xE9,0x0F,   0,0x8A,0xFF,0x7E,
-0x4E,0xFF,0xA2,   0,   0,0x2B,0xFF,0xC7,
-0x67,0xFF,0x89,   0,   0,0x10,0xFF,0xE2,
-0x6B,0xFF,0x87,   0,   0,0x0B,0xFF,0xE7,
-0x6A,0xFF,0x88,   0,   0,0x0C,0xFF,0xE6,
-0x54,0xFF,0x98,   0,   0,0x23,0xFF,0xCF,
-0x17,0xFA,0xE3,0x0B,   0,0x82,0xFF,0x8D,
-   0,0x8E,0xFF,0xD6,0xB7,0xFD,0xEE,0x1C,
-   0,0x03,0x82,0xE4,0xF8,0xF8,0xF2,0x3E,
-   0,   0,   0,   0,   0,0x3A,0xF1,0xF3,
-   0,   0,   0,   0,   0,   0,0x36,0x54,
+   0,0x07,0x90,0xE9,0xF6,0xC1,0x2E,   0,
+   0,0x96,0xFF,0x6D,0x1F,0xE4,0xEA,0x11,
+0x0F,0xF9,0xEE,0x01,   0,0x83,0xFF,0x70,
+0x42,0xFF,0xCB,   0,   0,0x5D,0xFF,0xAA,
+0x5A,0xFF,0xBE,   0,   0,0x4F,0xFF,0xC3,
+0x5A,0xFF,0xBE,   0,   0,0x4F,0xFF,0xC4,
+0x43,0xFF,0xCB,   0,   0,0x5D,0xFF,0xB1,
+0x0F,0xFA,0xEE,0x01,   0,0x83,0xFF,0x7D,
+   0,0x96,0xFF,0x6B,0x1F,0xE2,0xFA,0x22,
+   0,0x07,0x91,0xEB,0xFF,0xFF,0x70,   0,
+   0,   0,   0,   0,0x2C,0xF5,0xDF,0x1E,
+   0,   0,   0,   0,   0,0x5E,0x95,0x03,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
 // 'R'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-0x1B,0xFF,0xFF,0xFF,0xF4,0xCC,0x57,   0,
-0x1B,0xFF,0xEF,0xA7,0xB3,0xF8,0xFF,0x4E,
-0x1B,0xFF,0xCF,   0,   0,0x53,0xFF,0xBE,
-0x1B,0xFF,0xCF,   0,   0,0x19,0xFF,0xD4,
-0x1B,0xFF,0xCF,   0,   0,0x55,0xFF,0xAF,
-0x1B,0xFF,0xF0,0xAB,0xB9,0xF9,0xF9,0x3A,
-0x1B,0xFF,0xFF,0xFF,0xFF,0xFF,0x4D,   0,
-0x1B,0xFF,0xCF,   0,0x80,0xFF,0x8C,   0,
-0x1B,0xFF,0xCF,   0,0x13,0xF5,0xF4,0x14,
-0x1B,0xFF,0xCF,   0,   0,0x90,0xFF,0x84,
-0x1B,0xFF,0xCF,   0,   0,0x1D,0xFA,0xF1,
+0x18,0xFF,0xFF,0xFF,0xF5,0xCC,0x55,   0,
+0x18,0xFF,0xEC,   0,0x27,0xE7,0xFA,0x2A,
+0x18,0xFF,0xEC,   0,   0,0xA0,0xFF,0x6A,
+0x18,0xFF,0xEC,   0,   0,0xA1,0xFF,0x70,
+0x18,0xFF,0xEC,   0,0x26,0xE7,0xF6,0x23,
+0x18,0xFF,0xFF,0xFF,0xFF,0xEB,0x37,   0,
+0x18,0xFF,0xEC,0x05,0x99,0xFF,0xA2,   0,
+0x18,0xFF,0xEC,   0,0x0D,0xEE,0xFD,0x29,
+0x18,0xFF,0xEC,   0,   0,0x81,0xFF,0xA9,
+0x18,0xFF,0xEC,   0,   0,0x12,0xF3,0xFE,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4863,18 +4272,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,0x07,0x7E,0xDA,0xF4,0xCD,0x59,   0,
-   0,0x9B,0xFF,0xD9,0xAB,0xEC,0xFF,0x59,
-0x0A,0xFC,0xE7,0x07,   0,0x27,0xFF,0xD1,
-0x06,0xFA,0xEC,0x14,   0,   0,0x48,0x46,
-   0,0xA0,0xFF,0xE8,0x81,0x23,   0,   0,
-   0,0x09,0x98,0xFC,0xFF,0xFD,0x92,0x01,
-   0,   0,   0,0x1C,0x7F,0xEB,0xFF,0x7D,
-0x28,0x6B,0x3A,   0,   0,0x23,0xFE,0xE1,
-0x40,0xFF,0xC1,   0,   0,0x11,0xFB,0xE5,
-0x01,0xB6,0xFF,0xCA,0x9C,0xDA,0xFF,0x82,
-   0,0x0A,0x7F,0xD9,0xF6,0xDB,0x78,0x03,
+   0,0x15,0x9E,0xE6,0xF0,0xBD,0x46,   0,
+   0,0xBA,0xFA,0x3D,0x07,0x38,0xB7,0x03,
+0x0C,0xFE,0xEA,0x02,   0,   0,   0,   0,
+0x0C,0xFE,0xFF,0xB1,0x2E,   0,   0,   0,
+   0,0x9B,0xFF,0xFF,0xFF,0xBB,0x31,   0,
+   0,0x01,0x5F,0xD4,0xFF,0xFF,0xF5,0x26,
+   0,   0,   0,   0,0x4F,0xEB,0xFF,0x82,
+   0,   0,   0,   0,   0,0x82,0xFF,0x83,
+0x13,0xB8,0x48,0x14,0x17,0xC4,0xFD,0x3B,
+   0,0x4C,0xBD,0xEE,0xF0,0xC9,0x53,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4883,18 +4290,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,
-0xCF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-0x88,0xA7,0xA7,0xEC,0xFF,0xB4,0xA7,0xA7,
-   0,   0,   0,0xC7,0xFF,0x23,   0,   0,
-   0,   0,   0,0xC7,0xFF,0x23,   0,   0,
-   0,   0,   0,0xC7,0xFF,0x23,   0,   0,
-   0,   0,   0,0xC7,0xFF,0x23,   0,   0,
-   0,   0,   0,0xC7,0xFF,0x23,   0,   0,
-   0,   0,   0,0xC7,0xFF,0x23,   0,   0,
-   0,   0,   0,0xC7,0xFF,0x23,   0,   0,
-   0,   0,   0,0xC7,0xFF,0x23,   0,   0,
-   0,   0,   0,0xC7,0xFF,0x23,   0,   0,
+0x64,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD0,
+   0,   0,   0,0xCC,0xFF,0x38,   0,   0,
+   0,   0,   0,0xCC,0xFF,0x38,   0,   0,
+   0,   0,   0,0xCC,0xFF,0x38,   0,   0,
+   0,   0,   0,0xCC,0xFF,0x38,   0,   0,
+   0,   0,   0,0xCC,0xFF,0x38,   0,   0,
+   0,   0,   0,0xCC,0xFF,0x38,   0,   0,
+   0,   0,   0,0xCC,0xFF,0x38,   0,   0,
+   0,   0,   0,0xCC,0xFF,0x38,   0,   0,
+   0,   0,   0,0xCC,0xFF,0x38,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4903,18 +4308,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,
-0x20,0xFF,0xCB,   0,   0,0x60,0xFF,0x87,
-0x21,0xFF,0xCB,   0,   0,0x61,0xFF,0x87,
-0x21,0xFF,0xCB,   0,   0,0x61,0xFF,0x87,
-0x22,0xFF,0xCB,   0,   0,0x62,0xFF,0x87,
-0x22,0xFF,0xCB,   0,   0,0x62,0xFF,0x87,
-0x23,0xFF,0xCB,   0,   0,0x63,0xFF,0x87,
-0x23,0xFF,0xCB,   0,   0,0x63,0xFF,0x87,
-0x18,0xFF,0xD2,   0,   0,0x6B,0xFF,0x7B,
-   0,0xF1,0xF5,0x0F,   0,0xA2,0xFF,0x55,
-   0,0x86,0xFF,0xD4,0xB4,0xFF,0xE2,0x08,
-   0,0x05,0x87,0xE1,0xEF,0xB7,0x24,   0,
+0x48,0xFF,0xBC,   0,   0,0x50,0xFF,0xB4,
+0x48,0xFF,0xBC,   0,   0,0x50,0xFF,0xB4,
+0x48,0xFF,0xBC,   0,   0,0x50,0xFF,0xB4,
+0x48,0xFF,0xBC,   0,   0,0x50,0xFF,0xB4,
+0x48,0xFF,0xBC,   0,   0,0x50,0xFF,0xB4,
+0x48,0xFF,0xBC,   0,   0,0x50,0xFF,0xB4,
+0x47,0xFF,0xBC,   0,   0,0x50,0xFF,0xB2,
+0x2E,0xFF,0xC4,   0,   0,0x58,0xFF,0x99,
+0x06,0xDE,0xF9,0x3B,0x11,0xB9,0xFF,0x50,
+   0,0x2D,0xB6,0xEA,0xFB,0xDC,0x77,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4923,18 +4326,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,
-0xA5,0xFF,0x70,   0,   0,0x0D,0xFC,0xFC,
-0x5F,0xFF,0xAC,   0,   0,0x47,0xFF,0xC5,
-0x1A,0xFF,0xE8,   0,   0,0x83,0xFF,0x7F,
-   0,0xD3,0xFF,0x24,   0,0xC0,0xFF,0x39,
-   0,0x8D,0xFF,0x60,0x05,0xF6,0xF0,0x03,
-   0,0x48,0xFF,0x9C,0x39,0xFF,0xAD,   0,
-   0,0x0A,0xF8,0xD8,0x75,0xFF,0x66,   0,
-   0,   0,0xBC,0xFF,0xC8,0xFF,0x21,   0,
-   0,   0,0x76,0xFF,0xFF,0xDA,   0,   0,
-   0,   0,0x30,0xFF,0xFF,0x94,   0,   0,
-   0,   0,0x01,0xE9,0xFF,0x4E,   0,   0,
+0x7E,0xFF,0x87,   0,   0,0x18,0xFF,0xEB,
+0x40,0xFF,0xBE,   0,   0,0x4F,0xFF,0xAE,
+0x08,0xF9,0xF2,0x02,   0,0x86,0xFF,0x6F,
+   0,0xC4,0xFF,0x2C,   0,0xBD,0xFF,0x31,
+   0,0x86,0xFF,0x63,0x02,0xF1,0xF0,0x02,
+   0,0x48,0xFF,0x9A,0x2B,0xFF,0xB4,   0,
+   0,0x0D,0xFC,0xD1,0x62,0xFF,0x76,   0,
+   0,   0,0xCC,0xFC,0xA5,0xFF,0x37,   0,
+   0,   0,0x8E,0xFF,0xF8,0xF4,0x04,   0,
+   0,   0,0x4F,0xFF,0xFF,0xBB,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4943,18 +4344,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,
-0xC4,0xFA,0x02,0x90,0xF0,   0,0x92,0xFF,
-0xA4,0xFF,0x18,0xB1,0xFF,0x12,0xAD,0xFF,
-0x84,0xFF,0x33,0xD2,0xFF,0x34,0xC9,0xEF,
-0x64,0xFF,0x4E,0xF3,0xFF,0x56,0xE4,0xCE,
-0x44,0xFF,0x7D,0xFF,0xF9,0x7C,0xFC,0xAE,
-0x24,0xFF,0xB9,0xFF,0xBC,0xB7,0xFF,0x8E,
-0x06,0xFD,0xF3,0xE9,0x87,0xF1,0xFF,0x6E,
-   0,0xE4,0xFF,0xC5,0x61,0xFF,0xFF,0x4E,
-   0,0xC4,0xFF,0xA1,0x3B,0xFF,0xFF,0x2E,
-   0,0xA4,0xFF,0x7D,0x15,0xFF,0xFF,0x0F,
-   0,0x84,0xFF,0x59,   0,0xEF,0xF0,   0,
+0xF0,0xD0,   0,   0,   0,   0,0x62,0xFF,
+0xD0,0xE9,   0,   0,   0,   0,0x76,0xFF,
+0xAF,0xFE,0x04,   0,   0,   0,0x8A,0xFF,
+0x8F,0xFF,0x1B,0xB9,0xFF,0x28,0x9E,0xFD,
+0x6F,0xFF,0x34,0xEA,0xFF,0x63,0xB1,0xE4,
+0x4E,0xFF,0x6A,0xFF,0xC9,0x9E,0xC5,0xC6,
+0x2E,0xFF,0xB5,0xE5,0x71,0xD9,0xD9,0xA8,
+0x0D,0xFF,0xF7,0xAC,0x35,0xFF,0xF7,0x8A,
+   0,0xED,0xFF,0x74,0x04,0xF5,0xFF,0x6C,
+   0,0xCC,0xFF,0x3C,   0,0xBE,0xFF,0x4E,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4963,18 +4362,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,
-0x77,0xFF,0xC2,   0,   0,0x37,0xFF,0xF4,
-0x0B,0xEA,0xFF,0x3F,   0,0xB6,0xFF,0x87,
-   0,0x73,0xFF,0xBD,0x35,0xFF,0xF2,0x13,
-   0,0x09,0xE7,0xFF,0xD8,0xFF,0x82,   0,
-   0,   0,0x6F,0xFF,0xFF,0xF0,0x10,   0,
-   0,   0,0x10,0xFC,0xFF,0x9D,   0,   0,
-   0,   0,0x70,0xFF,0xFF,0xEF,0x10,   0,
-   0,0x0C,0xEA,0xF9,0x97,0xFF,0x85,   0,
-   0,0x7C,0xFF,0x9D,0x12,0xF4,0xF4,0x17,
-0x12,0xF0,0xFE,0x29,   0,0x90,0xFF,0x91,
-0x88,0xFF,0xB2,   0,   0,0x1F,0xFB,0xF9,
+0x71,0xFF,0xA6,   0,   0,0x38,0xFE,0xD7,
+0x04,0xD5,0xFF,0x3C,0x01,0xCA,0xFF,0x46,
+   0,0x42,0xFF,0xCE,0x64,0xFF,0xAF,   0,
+   0,   0,0xAB,0xFF,0xFA,0xF7,0x21,   0,
+   0,   0,0x1E,0xF6,0xFF,0x84,   0,   0,
+   0,   0,0x2E,0xFC,0xFF,0x9A,   0,   0,
+   0,   0,0xC1,0xFF,0xF1,0xFD,0x33,   0,
+   0,0x58,0xFF,0xBC,0x4F,0xFF,0xC6,0x01,
+0x0A,0xE3,0xFB,0x2A,   0,0xB8,0xFF,0x5E,
+0x85,0xFF,0x8F,   0,   0,0x28,0xFA,0xE6,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -4983,18 +4380,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,
-0x90,0xFF,0x89,   0,   0,0x09,0xED,0xFE,
-0x23,0xFD,0xEE,0x0A,   0,0x63,0xFF,0xB8,
-   0,0xB2,0xFF,0x65,   0,0xCF,0xFF,0x49,
-   0,0x43,0xFF,0xD3,0x3D,0xFF,0xD9,0x01,
-   0,   0,0xD3,0xFF,0xD9,0xFF,0x6B,   0,
-   0,   0,0x65,0xFF,0xFF,0xF0,0x0C,   0,
-   0,   0,0x09,0xEC,0xFF,0x8D,   0,   0,
-   0,   0,   0,0xB0,0xFF,0x3F,   0,   0,
-   0,   0,   0,0xAF,0xFF,0x3B,   0,   0,
-   0,   0,   0,0xAF,0xFF,0x3B,   0,   0,
-   0,   0,   0,0xAF,0xFF,0x3B,   0,   0,
+0xAE,0xFF,0x7A,   0,   0,0x15,0xF5,0xFA,
+0x2B,0xFD,0xEC,0x0C,   0,0x8A,0xFF,0x97,
+   0,0xA5,0xFF,0x78,0x14,0xF4,0xF7,0x1B,
+   0,0x24,0xFB,0xEB,0x92,0xFF,0x8D,   0,
+   0,   0,0x9B,0xFF,0xFF,0xF3,0x14,   0,
+   0,   0,0x1D,0xF8,0xFF,0x82,   0,   0,
+   0,   0,   0,0xCC,0xFF,0x38,   0,   0,
+   0,   0,   0,0xCC,0xFF,0x38,   0,   0,
+   0,   0,   0,0xCC,0xFF,0x38,   0,   0,
+   0,   0,   0,0xCC,0xFF,0x38,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5003,18 +4398,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,
-0x5F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC3,
-0x3E,0xA7,0xA7,0xA7,0xA7,0xE2,0xFF,0x93,
-   0,   0,   0,   0,0x1C,0xF4,0xED,0x12,
-   0,   0,   0,   0,0xA9,0xFF,0x68,   0,
-   0,   0,   0,0x41,0xFF,0xCF,0x02,   0,
-   0,   0,0x04,0xD5,0xFF,0x3B,   0,   0,
-   0,   0,0x72,0xFF,0xA3,   0,   0,   0,
-   0,0x18,0xF1,0xF2,0x19,   0,   0,   0,
-   0,0xA3,0xFF,0x75,   0,   0,   0,   0,
-0x38,0xFF,0xFF,0xA9,0xA3,0xA3,0xA3,0x8F,
-0x63,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xDF,
+0x10,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD8,
+   0,   0,   0,   0,0x0D,0xE3,0xFF,0xD3,
+   0,   0,   0,   0,0x94,0xFF,0xFF,0x5F,
+   0,   0,   0,0x39,0xFD,0xFF,0xB7,   0,
+   0,   0,0x05,0xD4,0xFF,0xF1,0x1D,   0,
+   0,   0,0x7D,0xFF,0xFF,0x67,   0,   0,
+   0,0x27,0xF8,0xFF,0xBE,0x01,   0,   0,
+0x01,0xC1,0xFF,0xF5,0x22,   0,   0,   0,
+0x34,0xFF,0xFF,0x6F,   0,   0,   0,   0,
+0x38,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5022,74 +4415,66 @@
 // '['
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x25,0x8B,0x8B,0x6F,   0,   0,
-   0,   0,0x43,0xFF,0xFF,0xCB,   0,   0,
-   0,   0,0x43,0xFF,0x9F,   0,   0,   0,
-   0,   0,0x43,0xFF,0x9F,   0,   0,   0,
-   0,   0,0x43,0xFF,0x9F,   0,   0,   0,
-   0,   0,0x43,0xFF,0x9F,   0,   0,   0,
-   0,   0,0x43,0xFF,0x9F,   0,   0,   0,
-   0,   0,0x43,0xFF,0x9F,   0,   0,   0,
-   0,   0,0x43,0xFF,0x9F,   0,   0,   0,
-   0,   0,0x43,0xFF,0x9F,   0,   0,   0,
-   0,   0,0x43,0xFF,0x9F,   0,   0,   0,
-   0,   0,0x43,0xFF,0x9F,   0,   0,   0,
-   0,   0,0x43,0xFF,0x9F,   0,   0,   0,
-   0,   0,0x43,0xFF,0xD5,0x72,   0,   0,
-   0,   0,0x43,0xFF,0xFF,0xCB,   0,   0,
+   0,   0,0x1C,0xFF,0xFF,0xFF,0x5C,   0,
+   0,   0,0x1C,0xFF,0xB4,   0,   0,   0,
+   0,   0,0x1C,0xFF,0xB4,   0,   0,   0,
+   0,   0,0x1C,0xFF,0xB4,   0,   0,   0,
+   0,   0,0x1C,0xFF,0xB4,   0,   0,   0,
+   0,   0,0x1C,0xFF,0xB4,   0,   0,   0,
+   0,   0,0x1C,0xFF,0xB4,   0,   0,   0,
+   0,   0,0x1C,0xFF,0xB4,   0,   0,   0,
+   0,   0,0x1C,0xFF,0xB4,   0,   0,   0,
+   0,   0,0x1C,0xFF,0xB4,   0,   0,   0,
+   0,   0,0x1C,0xFF,0xB4,   0,   0,   0,
+   0,   0,0x1C,0xFF,0xFF,0xFF,0x5C,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
 // '\'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x33,0xFF,0x94,   0,   0,   0,   0,
-   0,   0,0xDF,0xE5,0x01,   0,   0,   0,
-   0,   0,0x8D,0xFF,0x3A,   0,   0,   0,
-   0,   0,0x3A,0xFF,0x8D,   0,   0,   0,
-   0,   0,0x01,0xE5,0xE0,   0,   0,   0,
-   0,   0,   0,0x94,0xFF,0x33,   0,   0,
-   0,   0,   0,0x41,0xFF,0x86,   0,   0,
-   0,   0,   0,0x03,0xEB,0xD9,   0,   0,
-   0,   0,   0,   0,0x9B,0xFF,0x2C,   0,
-   0,   0,   0,   0,0x48,0xFF,0x7E,   0,
-   0,   0,   0,   0,0x05,0xF0,0xD1,   0,
-   0,   0,   0,   0,   0,0x59,0x7B,0x07,
-   0,   0,   0,   0,   0,   0,   0,   0,
+0x10,0xF3,0x80,   0,   0,   0,   0,   0,
+   0,0x91,0xEA,0x08,   0,   0,   0,   0,
+   0,0x21,0xFC,0x66,   0,   0,   0,   0,
+   0,   0,0xAC,0xD7,0x01,   0,   0,   0,
+   0,   0,0x3A,0xFF,0x4B,   0,   0,   0,
+   0,   0,   0,0xC7,0xBE,   0,   0,   0,
+   0,   0,   0,0x55,0xFF,0x31,   0,   0,
+   0,   0,   0,0x03,0xDF,0xA3,   0,   0,
+   0,   0,   0,   0,0x71,0xFA,0x1B,   0,
+   0,   0,   0,   0,0x0D,0xF0,0x88,   0,
+   0,   0,   0,   0,   0,0x8C,0xEF,0x0C,
+   0,   0,   0,   0,   0,0x1D,0xFB,0x6E,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
 // ']'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x25,0x8B,0x8B,0x6F,   0,   0,
-   0,   0,0x43,0xFF,0xFF,0xCB,   0,   0,
-   0,   0,   0,0x17,0xFF,0xCB,   0,   0,
-   0,   0,   0,0x17,0xFF,0xCB,   0,   0,
-   0,   0,   0,0x17,0xFF,0xCB,   0,   0,
-   0,   0,   0,0x17,0xFF,0xCB,   0,   0,
-   0,   0,   0,0x17,0xFF,0xCB,   0,   0,
-   0,   0,   0,0x17,0xFF,0xCB,   0,   0,
-   0,   0,   0,0x17,0xFF,0xCB,   0,   0,
-   0,   0,   0,0x17,0xFF,0xCB,   0,   0,
-   0,   0,   0,0x17,0xFF,0xCB,   0,   0,
-   0,   0,   0,0x17,0xFF,0xCB,   0,   0,
-   0,   0,   0,0x17,0xFF,0xCB,   0,   0,
-   0,   0,0x26,0x9A,0xFF,0xCB,   0,   0,
-   0,   0,0x43,0xFF,0xFF,0xCB,   0,   0,
+   0,   0,0xEC,0xFF,0xFF,0x8C,   0,   0,
+   0,   0,   0,0x48,0xFF,0x8C,   0,   0,
+   0,   0,   0,0x48,0xFF,0x8C,   0,   0,
+   0,   0,   0,0x48,0xFF,0x8C,   0,   0,
+   0,   0,   0,0x48,0xFF,0x8C,   0,   0,
+   0,   0,   0,0x48,0xFF,0x8C,   0,   0,
+   0,   0,   0,0x48,0xFF,0x8C,   0,   0,
+   0,   0,   0,0x48,0xFF,0x8C,   0,   0,
+   0,   0,   0,0x48,0xFF,0x8C,   0,   0,
+   0,   0,   0,0x48,0xFF,0x8C,   0,   0,
+   0,   0,   0,0x48,0xFF,0x8C,   0,   0,
+   0,   0,0xEC,0xFF,0xFF,0x8C,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
 // '^'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,0x17,0xE8,0xFF,0x6E,   0,   0,
+   0,0x02,0xBC,0xFF,0xF9,0xF9,0x34,   0,
+   0,0x7E,0xFF,0x8E,0x32,0xED,0xDD,0x0F,
+0x3F,0xFC,0x8C,   0,   0,0x30,0xEC,0xAB,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x3A,0x7F,0x0E,   0,   0,
-   0,   0,   0,0xC1,0xFF,0x68,   0,   0,
-   0,   0,0x28,0xFF,0xD2,0xCD,   0,   0,
-   0,   0,0x8D,0xE3,0x47,0xFF,0x32,   0,
-   0,0x07,0xEC,0x87,0x02,0xE3,0x97,   0,
-   0,0x59,0xFF,0x2A,   0,0x87,0xF1,0x0B,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5115,17 +4500,13 @@
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x89,0x8B,0x8B,0x8B,0x8B,0x8B,0x22,
-   0,0xFB,0xFF,0xFF,0xFF,0xFF,0xFF,0x3F,
-   0,   0,   0,   0,   0,   0,   0,   0,
+0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
    0,   0,   0,   0,   0,   0,   0,   0,
 // '`'
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x01,0x07,0x07,   0,   0,   0,
-   0,   0,0x03,0xB4,0xFE,0x39,   0,   0,
-   0,   0,   0,0x0B,0xCA,0xCD,0x02,   0,
+   0,0x3F,0xFA,0x9A,   0,   0,   0,   0,
+   0,   0,0x62,0xFE,0x40,   0,   0,   0,
+   0,   0,   0,0x8B,0xDB,0x09,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5145,16 +4526,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,0x1E,0xAB,0xEA,0xEF,0xB6,0x28,   0,
-   0,0xCA,0xFF,0x9E,0xA0,0xFD,0xDD,0x02,
-0x01,0x5B,0x50,   0,   0,0xB9,0xFF,0x28,
-   0,0x2D,0xB5,0xEA,0xFE,0xFF,0xFF,0x37,
-0x05,0xE6,0xF7,0x60,0x32,0xBE,0xFF,0x37,
-0x2A,0xFF,0xBA,   0,   0,0xB7,0xFF,0x37,
-0x0D,0xF2,0xF4,0x7A,0x99,0xFE,0xFF,0x3E,
-   0,0x45,0xD5,0xF9,0xC9,0xB7,0xFF,0x66,
+   0,0x1D,0xA0,0xE1,0xF9,0xDB,0x6F,   0,
+   0,0x7C,0x65,0x21,0x10,0xBA,0xFF,0x3F,
+   0,   0,   0,   0,   0,0x6F,0xFF,0x80,
+   0,0x4F,0xC6,0xEE,0xFF,0xFF,0xFF,0x92,
+0x23,0xFB,0xF8,0x44,0x07,0x74,0xFF,0x94,
+0x50,0xFF,0xD1,   0,   0,0x99,0xFF,0x94,
+0x26,0xFD,0xF3,0x25,0x35,0xF0,0xFF,0x94,
+   0,0x60,0xDC,0xF6,0xCE,0xAD,0xFF,0x94,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5162,19 +4541,17 @@
 // 'b'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0xFF,0xE7,   0,   0,   0,   0,   0,
-   0,0xFF,0xE7,   0,   0,   0,   0,   0,
-   0,0xFF,0xE7,   0,   0,   0,   0,   0,
-   0,0xFF,0xEC,0xA0,0xF6,0xDC,0x50,   0,
-   0,0xFF,0xFF,0xDC,0xB7,0xFD,0xF8,0x1F,
-   0,0xFF,0xF2,0x0A,   0,0x8D,0xFF,0x71,
-   0,0xFF,0xE7,   0,   0,0x4D,0xFF,0x95,
-   0,0xFF,0xE7,   0,   0,0x49,0xFF,0x97,
-   0,0xFF,0xEE,0x02,   0,0x77,0xFF,0x74,
-   0,0xFF,0xFF,0xB6,0x8A,0xF2,0xFA,0x20,
-   0,0xFF,0xD2,0xAF,0xF6,0xDD,0x50,   0,
+   0,0xF8,0xFF,0x04,   0,   0,   0,   0,
+   0,0xF8,0xFF,0x04,   0,   0,   0,   0,
+   0,0xF8,0xFF,0x04,   0,   0,   0,   0,
+   0,0xF8,0xFF,0x91,0xEA,0xED,0x80,   0,
+   0,0xF8,0xFF,0xA2,0x16,0xC5,0xFF,0x48,
+   0,0xF8,0xFF,0x30,   0,0x5C,0xFF,0xA2,
+   0,0xF8,0xFF,0x0D,   0,0x3A,0xFF,0xC2,
+   0,0xF8,0xFF,0x0D,   0,0x3A,0xFF,0xC1,
+   0,0xF8,0xFF,0x30,   0,0x5C,0xFF,0xA2,
+   0,0xF8,0xFF,0xA2,0x16,0xC5,0xFF,0x46,
+   0,0xF8,0xFF,0x92,0xEB,0xF0,0x82,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5185,16 +4562,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,0x02,0x7B,0xE6,0xF2,0xBC,0x31,   0,
-   0,0x83,0xFF,0xDD,0xB6,0xFD,0xE8,0x10,
-0x05,0xF4,0xEF,0x0F,   0,0x88,0xFF,0x4B,
-0x25,0xFF,0xBC,   0,   0,0x01,0x03,0x01,
-0x25,0xFF,0xBA,   0,   0,   0,   0,   0,
-0x05,0xF5,0xEB,0x0A,   0,0x65,0xCB,0x46,
-   0,0x82,0xFF,0xD1,0xA3,0xF6,0xE9,0x14,
-   0,0x02,0x7E,0xE8,0xF3,0xBB,0x2E,   0,
+   0,   0,0x3C,0xC2,0xF6,0xE0,0x87,0x06,
+   0,0x22,0xF7,0xE0,0x32,0x0D,0x72,0x3A,
+   0,0x98,0xFF,0x67,   0,   0,   0,   0,
+   0,0xC5,0xFF,0x39,   0,   0,   0,   0,
+   0,0xC5,0xFF,0x38,   0,   0,   0,   0,
+   0,0x98,0xFF,0x66,   0,   0,   0,   0,
+   0,0x22,0xF7,0xDF,0x30,0x13,0x70,0x39,
+   0,   0,0x3D,0xC3,0xF7,0xE2,0x82,0x05,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5202,19 +4577,17 @@
 // 'd'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,0x87,0xFF,0x63,
-   0,   0,   0,   0,   0,0x87,0xFF,0x63,
-   0,   0,   0,   0,   0,0x87,0xFF,0x63,
-   0,0x0E,0xAD,0xF6,0xC7,0xAF,0xFF,0x63,
-   0,0xA7,0xFF,0xDD,0xC2,0xFF,0xFF,0x63,
-0x0F,0xFC,0xED,0x0E,   0,0xA1,0xFF,0x63,
-0x2E,0xFF,0xB6,   0,   0,0x87,0xFF,0x63,
-0x2F,0xFF,0xB4,   0,   0,0x87,0xFF,0x63,
-0x0F,0xFC,0xE8,0x09,   0,0x9B,0xFF,0x63,
-   0,0xA5,0xFF,0xD1,0xB6,0xFE,0xFF,0x63,
-   0,0x0D,0xAD,0xF6,0xC9,0x8D,0xFF,0x63,
+   0,   0,   0,   0,   0,0x98,0xFF,0x68,
+   0,   0,   0,   0,   0,0x98,0xFF,0x68,
+   0,   0,   0,   0,   0,0x98,0xFF,0x68,
+   0,0x34,0xD1,0xF6,0xC4,0xBE,0xFF,0x68,
+0x01,0xDA,0xFD,0x44,0x40,0xFC,0xFF,0x68,
+0x37,0xFF,0xCA,   0,   0,0xC4,0xFF,0x68,
+0x56,0xFF,0xA9,   0,   0,0xA2,0xFF,0x68,
+0x57,0xFF,0xA8,   0,   0,0xA2,0xFF,0x68,
+0x37,0xFF,0xCA,   0,   0,0xC4,0xFF,0x68,
+0x01,0xDB,0xFD,0x44,0x40,0xFC,0xFF,0x68,
+   0,0x36,0xD4,0xF6,0xC5,0xBD,0xFF,0x68,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5225,16 +4598,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,0x68,0xE0,0xF9,0xCD,0x40,   0,
-   0,0x72,0xFF,0xDC,0xAE,0xF0,0xFA,0x28,
-0x08,0xF2,0xE8,0x25,0x1B,0x5A,0xFF,0x8C,
-0x31,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB2,
-0x36,0xFF,0xD8,0x4B,0x4B,0x4B,0x4B,0x36,
-0x0D,0xF7,0xFA,0x2D,   0,0x01,0x5E,0x01,
-   0,0x74,0xFF,0xF0,0xA5,0xC8,0xFF,0x59,
-   0,   0,0x60,0xDA,0xF9,0xDF,0x7D,0x05,
+   0,0x0B,0x94,0xE9,0xF4,0xCE,0x57,   0,
+   0,0xA5,0xFE,0x50,0x0F,0xA7,0xFF,0x4D,
+0x21,0xFE,0xC9,   0,   0,0x39,0xFF,0xB4,
+0x4C,0xFF,0xFE,0xFC,0xFD,0xFF,0xFF,0xD7,
+0x57,0xFF,0xB8,   0,   0,   0,   0,   0,
+0x2B,0xFF,0xE2,0x02,   0,   0,   0,   0,
+   0,0xB6,0xFF,0x83,0x10,0x1F,0x69,0x71,
+   0,0x0B,0x8F,0xE3,0xF9,0xDA,0x8A,0x12,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5242,19 +4613,17 @@
 // 'f'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x4C,0x91,0xA6,0x76,
-   0,   0,   0,0x82,0xFF,0xFF,0xFF,0xCF,
-   0,   0,0x08,0xFA,0xF2,0x39,0x06,0x0F,
-   0,   0,0x2D,0xFF,0xB8,   0,   0,   0,
-0x23,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x5F,
-0x11,0x7B,0x96,0xFF,0xD8,0x7B,0x7B,0x2E,
-   0,   0,0x33,0xFF,0xB3,   0,   0,   0,
-   0,   0,0x33,0xFF,0xB3,   0,   0,   0,
-   0,   0,0x33,0xFF,0xB3,   0,   0,   0,
-   0,   0,0x33,0xFF,0xB3,   0,   0,   0,
-   0,   0,0x33,0xFF,0xB3,   0,   0,   0,
-   0,   0,0x33,0xFF,0xB3,   0,   0,   0,
+   0,   0,   0,0x4E,0xD8,0xF8,0xFF,0x68,
+   0,   0,   0,0xD8,0xFF,0x2E,   0,   0,
+   0,   0,   0,0xF2,0xFF,0x0C,   0,   0,
+   0,0xD0,0xFF,0xFF,0xFF,0xFF,0xFF,0x68,
+   0,   0,   0,0xF4,0xFF,0x0C,   0,   0,
+   0,   0,   0,0xF4,0xFF,0x0C,   0,   0,
+   0,   0,   0,0xF4,0xFF,0x0C,   0,   0,
+   0,   0,   0,0xF4,0xFF,0x0C,   0,   0,
+   0,   0,   0,0xF4,0xFF,0x0C,   0,   0,
+   0,   0,   0,0xF4,0xFF,0x0C,   0,   0,
+   0,   0,   0,0xF4,0xFF,0x0C,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5265,36 +4634,32 @@
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x0A,0xA2,0xF6,0xE5,0xA8,0xFF,0x7B,
-   0,0x9E,0xFF,0xC8,0x8E,0xEF,0xFF,0x7B,
-0x0C,0xFB,0xEC,0x08,   0,0x73,0xFF,0x7B,
-0x2D,0xFF,0xB9,   0,   0,0x6B,0xFF,0x7B,
-0x2E,0xFF,0xB9,   0,   0,0x6B,0xFF,0x7B,
-0x0C,0xFB,0xF0,0x10,   0,0x79,0xFF,0x7B,
-   0,0x9C,0xFF,0xD9,0xA9,0xF7,0xFF,0x7B,
-   0,0x09,0xA2,0xF6,0xDD,0xB2,0xFF,0x7A,
-   0,0x0C,0x25,   0,   0,0xA0,0xFF,0x5E,
-   0,0x8D,0xF2,0xA2,0xB7,0xFF,0xE0,0x0C,
-   0,0x23,0xAD,0xF3,0xEC,0xB1,0x26,   0,
+   0,0x1F,0xC1,0xF7,0xD3,0xBF,0xFF,0x80,
+   0,0xBC,0xFF,0x54,0x38,0xF9,0xFF,0x80,
+0x1F,0xFF,0xD9,   0,   0,0xB4,0xFF,0x80,
+0x43,0xFF,0xB5,   0,   0,0x8E,0xFF,0x80,
+0x47,0xFF,0xB5,   0,   0,0x8F,0xFF,0x80,
+0x25,0xFF,0xD9,   0,   0,0xB4,0xFF,0x80,
+   0,0xC5,0xFF,0x54,0x37,0xF8,0xFF,0x80,
+   0,0x24,0xC5,0xF8,0xD6,0xBF,0xFF,0x7E,
+   0,   0,   0,   0,   0,0x97,0xFF,0x63,
+   0,0x6B,0x52,0x11,0x2B,0xE8,0xF8,0x22,
+   0,0x19,0xA3,0xE9,0xF8,0xCF,0x53,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
 // 'h'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-0x07,0xFF,0xDB,   0,   0,   0,   0,   0,
-0x07,0xFF,0xDB,   0,   0,   0,   0,   0,
-0x07,0xFF,0xDB,   0,   0,   0,   0,   0,
-0x07,0xFF,0xDB,0x6F,0xEB,0xE6,0x75,   0,
-0x07,0xFF,0xFA,0xD5,0xB5,0xFA,0xFF,0x3C,
-0x07,0xFF,0xE4,0x03,   0,0x7B,0xFF,0x87,
-0x07,0xFF,0xDB,   0,   0,0x51,0xFF,0x97,
-0x07,0xFF,0xDB,   0,   0,0x4F,0xFF,0x97,
-0x07,0xFF,0xDB,   0,   0,0x4F,0xFF,0x97,
-0x07,0xFF,0xDB,   0,   0,0x4F,0xFF,0x97,
-0x07,0xFF,0xDB,   0,   0,0x4F,0xFF,0x97,
+   0,0xD4,0xFF,0x2C,   0,   0,   0,   0,
+   0,0xD4,0xFF,0x2C,   0,   0,   0,   0,
+   0,0xD4,0xFF,0x2C,   0,   0,   0,   0,
+   0,0xD4,0xFF,0xA4,0xE2,0xEF,0x89,   0,
+   0,0xD4,0xFF,0x93,0x15,0xE1,0xFF,0x2E,
+   0,0xD4,0xFF,0x39,   0,0xB1,0xFF,0x51,
+   0,0xD4,0xFF,0x2C,   0,0xAC,0xFF,0x54,
+   0,0xD4,0xFF,0x2C,   0,0xAC,0xFF,0x54,
+   0,0xD4,0xFF,0x2C,   0,0xAC,0xFF,0x54,
+   0,0xD4,0xFF,0x2C,   0,0xAC,0xFF,0x54,
+   0,0xD4,0xFF,0x2C,   0,0xAC,0xFF,0x54,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5302,19 +4667,17 @@
 // 'i'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x88,0xFF,0x78,   0,   0,
+   0,   0,   0,0x88,0xFF,0x78,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x56,0xF4,0x64,   0,   0,
-   0,   0,   0,0x6B,0xFF,0x7E,   0,   0,
-   0,   0,   0,   0,0x1C,   0,   0,   0,
-   0,0x87,0xFF,0xFF,0xFF,0x7F,   0,   0,
-   0,0x57,0xA3,0xCA,0xFF,0x7F,   0,   0,
-   0,   0,   0,0x6B,0xFF,0x7F,   0,   0,
-   0,   0,   0,0x6B,0xFF,0x7F,   0,   0,
-   0,   0,   0,0x6B,0xFF,0x7F,   0,   0,
-   0,   0,   0,0x6B,0xFF,0x7F,   0,   0,
-   0,0x57,0xA3,0xCA,0xFF,0xD1,0xA3,0x51,
-   0,0x87,0xFF,0xFF,0xFF,0xFF,0xFF,0x7F,
+   0,0x7C,0xFF,0xFF,0xFF,0x78,   0,   0,
+   0,   0,   0,0x88,0xFF,0x78,   0,   0,
+   0,   0,   0,0x88,0xFF,0x78,   0,   0,
+   0,   0,   0,0x88,0xFF,0x78,   0,   0,
+   0,   0,   0,0x88,0xFF,0x78,   0,   0,
+   0,   0,   0,0x88,0xFF,0x78,   0,   0,
+   0,   0,   0,0x88,0xFF,0x78,   0,   0,
+0x04,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF8,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5322,39 +4685,35 @@
 // 'j'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x30,0xFF,0xD0,   0,   0,
+   0,   0,   0,0x30,0xFF,0xD0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x0D,0xDC,0xC2,   0,   0,
-   0,   0,   0,0x14,0xF4,0xE0,   0,   0,
-   0,   0,   0,   0,0x11,0x0C,   0,   0,
-   0,   0,0xE7,0xFF,0xFF,0xE3,   0,   0,
-   0,   0,0x94,0xA6,0xFF,0xE3,   0,   0,
-   0,   0,   0,0x07,0xFF,0xE3,   0,   0,
-   0,   0,   0,0x07,0xFF,0xE3,   0,   0,
-   0,   0,   0,0x07,0xFF,0xE3,   0,   0,
-   0,   0,   0,0x07,0xFF,0xE3,   0,   0,
-   0,   0,   0,0x07,0xFF,0xE3,   0,   0,
-   0,   0,   0,0x07,0xFF,0xE3,   0,   0,
-   0,   0,   0,0x25,0xFF,0xCF,   0,   0,
-   0,0x46,0xAD,0xE3,0xFF,0x8B,   0,   0,
-   0,0x6C,0xFE,0xE7,0x97,0x0B,   0,   0,
+   0,0x38,0xFF,0xFF,0xFF,0xD0,   0,   0,
+   0,   0,   0,0x30,0xFF,0xD0,   0,   0,
+   0,   0,   0,0x30,0xFF,0xD0,   0,   0,
+   0,   0,   0,0x30,0xFF,0xD0,   0,   0,
+   0,   0,   0,0x30,0xFF,0xD0,   0,   0,
+   0,   0,   0,0x30,0xFF,0xD0,   0,   0,
+   0,   0,   0,0x30,0xFF,0xD0,   0,   0,
+   0,   0,   0,0x30,0xFF,0xD0,   0,   0,
+   0,   0,   0,0x39,0xFF,0xC1,   0,   0,
+   0,   0,0x04,0x8A,0xFF,0x91,   0,   0,
+0x04,0xFF,0xFF,0xF3,0xB6,0x18,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
 // 'k'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-0x03,0xFF,0xE3,   0,   0,   0,   0,   0,
-0x03,0xFF,0xE3,   0,   0,   0,   0,   0,
-0x03,0xFF,0xE3,   0,   0,   0,   0,   0,
-0x03,0xFF,0xE3,   0,0x11,0xDA,0xFF,0x5D,
-0x03,0xFF,0xE3,0x04,0xBD,0xFF,0x88,   0,
-0x03,0xFF,0xE3,0x97,0xFF,0xB1,0x02,   0,
-0x03,0xFF,0xFD,0xFF,0xFF,0x31,   0,   0,
-0x03,0xFF,0xFF,0xF5,0xFF,0xC6,0x02,   0,
-0x03,0xFF,0xF3,0x22,0xC6,0xFF,0x77,   0,
-0x03,0xFF,0xE3,   0,0x29,0xF8,0xF9,0x2C,
-0x03,0xFF,0xE3,   0,   0,0x7B,0xFF,0xCE,
+0xD0,0xFF,0x30,   0,   0,   0,   0,   0,
+0xD0,0xFF,0x30,   0,   0,   0,   0,   0,
+0xD0,0xFF,0x30,   0,   0,   0,   0,   0,
+0xD0,0xFF,0x30,0x0C,0xCD,0xFF,0x8B,   0,
+0xD0,0xFF,0x34,0xB7,0xFF,0x91,   0,   0,
+0xD0,0xFF,0xC5,0xFF,0x97,   0,   0,   0,
+0xD0,0xFF,0xFF,0xFF,0x70,   0,   0,   0,
+0xD0,0xFF,0xA4,0xEC,0xF2,0x1A,   0,   0,
+0xD0,0xFF,0x30,0x6D,0xFF,0xA9,   0,   0,
+0xD0,0xFF,0x30,0x05,0xD9,0xFF,0x45,   0,
+0xD0,0xFF,0x30,   0,0x4F,0xFF,0xDA,0x07,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5362,19 +4721,17 @@
 // 'l'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0xA3,0xFF,0xFF,0xFF,0x7F,   0,   0,
-   0,0x69,0xA3,0xCA,0xFF,0x7F,   0,   0,
-   0,   0,   0,0x6B,0xFF,0x7F,   0,   0,
-   0,   0,   0,0x6B,0xFF,0x7F,   0,   0,
-   0,   0,   0,0x6B,0xFF,0x7F,   0,   0,
-   0,   0,   0,0x6B,0xFF,0x7F,   0,   0,
-   0,   0,   0,0x6B,0xFF,0x7F,   0,   0,
-   0,   0,   0,0x6B,0xFF,0x7F,   0,   0,
-   0,   0,   0,0x6B,0xFF,0x7F,   0,   0,
-   0,0x69,0xA3,0xCA,0xFF,0xD1,0xA3,0x63,
-   0,0xA3,0xFF,0xFF,0xFF,0xFF,0xFF,0x9B,
+0x64,0xFF,0xFF,0xFF,0xA8,   0,   0,   0,
+   0,   0,0x5C,0xFF,0xA8,   0,   0,   0,
+   0,   0,0x5C,0xFF,0xA8,   0,   0,   0,
+   0,   0,0x5C,0xFF,0xA8,   0,   0,   0,
+   0,   0,0x5C,0xFF,0xA8,   0,   0,   0,
+   0,   0,0x5C,0xFF,0xA8,   0,   0,   0,
+   0,   0,0x5C,0xFF,0xA8,   0,   0,   0,
+   0,   0,0x5C,0xFF,0xA8,   0,   0,   0,
+   0,   0,0x4E,0xFF,0xB1,   0,   0,   0,
+   0,   0,0x21,0xFD,0xE8,0x1B,   0,   0,
+   0,   0,   0,0x6C,0xE2,0xFE,0xFF,0x7C,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5385,16 +4742,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,
-0x7B,0xFF,0x90,0xF4,0xB4,0xCD,0xEC,0x44,
-0x7B,0xFF,0xB9,0xE9,0xFF,0x9F,0xFE,0xB5,
-0x7B,0xFF,0x40,0xAD,0xFF,   0,0xE9,0xD1,
-0x7B,0xFF,0x3F,0xAB,0xFF,   0,0xE7,0xD3,
-0x7B,0xFF,0x3F,0xAB,0xFF,   0,0xE7,0xD3,
-0x7B,0xFF,0x3F,0xAB,0xFF,   0,0xE7,0xD3,
-0x7B,0xFF,0x3F,0xAB,0xFF,   0,0xE7,0xD3,
-0x7B,0xFF,0x3F,0xAB,0xFF,   0,0xE7,0xD3,
+0x70,0xFF,0xBA,0xF2,0xAC,0xDE,0xED,0x56,
+0x70,0xFF,0x57,0xB7,0xFF,0x32,0xDF,0xC4,
+0x70,0xFF,0x35,0x96,0xFF,0x09,0xC2,0xDD,
+0x70,0xFF,0x34,0x94,0xFF,0x08,0xC0,0xE3,
+0x70,0xFF,0x34,0x94,0xFF,0x08,0xC0,0xE4,
+0x70,0xFF,0x34,0x94,0xFF,0x08,0xC0,0xE4,
+0x70,0xFF,0x34,0x94,0xFF,0x08,0xC0,0xE4,
+0x70,0xFF,0x34,0x94,0xFF,0x08,0xC0,0xE4,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5405,16 +4760,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,
-0x07,0xFF,0xBA,0x72,0xE6,0xEB,0x82,   0,
-0x07,0xFF,0xF9,0xD9,0xB4,0xF8,0xFF,0x3F,
-0x07,0xFF,0xEB,0x07,   0,0x79,0xFF,0x82,
-0x07,0xFF,0xDF,   0,   0,0x54,0xFF,0x8F,
-0x07,0xFF,0xDF,   0,   0,0x53,0xFF,0x8F,
-0x07,0xFF,0xDF,   0,   0,0x53,0xFF,0x8F,
-0x07,0xFF,0xDF,   0,   0,0x53,0xFF,0x8F,
-0x07,0xFF,0xDF,   0,   0,0x53,0xFF,0x8F,
+   0,0xD4,0xFF,0xA5,0xE2,0xEF,0x89,   0,
+   0,0xD4,0xFF,0x97,0x15,0xE2,0xFF,0x2D,
+   0,0xD4,0xFF,0x3A,   0,0xB1,0xFF,0x51,
+   0,0xD4,0xFF,0x2C,   0,0xAC,0xFF,0x54,
+   0,0xD4,0xFF,0x2C,   0,0xAC,0xFF,0x54,
+   0,0xD4,0xFF,0x2C,   0,0xAC,0xFF,0x54,
+   0,0xD4,0xFF,0x2C,   0,0xAC,0xFF,0x54,
+   0,0xD4,0xFF,0x2C,   0,0xAC,0xFF,0x54,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5425,16 +4778,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,0x04,0x86,0xEA,0xF7,0xBC,0x23,   0,
-   0,0x93,0xFF,0xDB,0xBB,0xFE,0xEA,0x0E,
-0x12,0xFB,0xE4,0x0B,   0,0x8D,0xFF,0x71,
-0x3B,0xFF,0xA6,   0,   0,0x44,0xFF,0x9F,
-0x3B,0xFF,0xA5,   0,   0,0x42,0xFF,0x9F,
-0x13,0xFB,0xDF,0x06,   0,0x84,0xFF,0x72,
-   0,0x94,0xFF,0xCF,0xAB,0xFC,0xEB,0x0F,
-   0,0x04,0x85,0xEA,0xF7,0xBC,0x24,   0,
+   0,0x09,0x93,0xE9,0xF8,0xC4,0x36,   0,
+   0,0x9C,0xFF,0x5E,0x1D,0xDA,0xF1,0x17,
+0x18,0xFD,0xDB,   0,   0,0x70,0xFF,0x84,
+0x42,0xFF,0xB6,   0,   0,0x4A,0xFF,0xB1,
+0x42,0xFF,0xB5,   0,   0,0x4B,0xFF,0xB0,
+0x19,0xFD,0xDB,   0,   0,0x6F,0xFF,0x84,
+   0,0x9C,0xFF,0x5C,0x1C,0xD8,0xF1,0x17,
+   0,0x09,0x93,0xEB,0xF8,0xC5,0x37,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5445,19 +4796,17 @@
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-0x03,0xFF,0xD0,0xA5,0xF6,0xDD,0x42,   0,
-0x03,0xFF,0xFF,0xD5,0xBF,0xFF,0xF6,0x15,
-0x03,0xFF,0xED,0x06,   0,0x9C,0xFF,0x6C,
-0x03,0xFF,0xE3,   0,   0,0x57,0xFF,0x8F,
-0x03,0xFF,0xE3,   0,   0,0x55,0xFF,0x8E,
-0x03,0xFF,0xEC,0x03,   0,0x95,0xFF,0x6A,
-0x03,0xFF,0xFF,0xC8,0xAD,0xFE,0xF5,0x13,
-0x03,0xFF,0xEB,0xAA,0xF7,0xDB,0x3E,   0,
-0x03,0xFF,0xE3,   0,   0,   0,   0,   0,
-0x03,0xFF,0xE3,   0,   0,   0,   0,   0,
-0x03,0xFF,0xE3,   0,   0,   0,   0,   0,
+   0,0xF8,0xFF,0x90,0xE7,0xEF,0x81,   0,
+   0,0xF8,0xFF,0xA2,0x16,0xC5,0xFF,0x46,
+   0,0xF8,0xFF,0x30,   0,0x5C,0xFF,0xA2,
+   0,0xF8,0xFF,0x0D,   0,0x3A,0xFF,0xC2,
+   0,0xF8,0xFF,0x0D,   0,0x3A,0xFF,0xC1,
+   0,0xF8,0xFF,0x30,   0,0x5C,0xFF,0xA2,
+   0,0xF8,0xFF,0xA2,0x16,0xC5,0xFF,0x48,
+   0,0xF8,0xFF,0x91,0xEB,0xEE,0x81,   0,
+   0,0xF8,0xFF,0x04,   0,   0,   0,   0,
+   0,0xF8,0xFF,0x04,   0,   0,   0,   0,
+   0,0xF8,0xFF,0x04,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
 // 'q'
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5465,19 +4814,17 @@
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x0F,0xAD,0xF7,0xDB,0xA0,0xFF,0x63,
-   0,0xA8,0xFF,0xBF,0x8E,0xF3,0xFF,0x63,
-0x0F,0xFC,0xE6,0x05,   0,0x8A,0xFF,0x63,
-0x2E,0xFF,0xB3,   0,   0,0x83,0xFF,0x63,
-0x2F,0xFF,0xB6,   0,   0,0x83,0xFF,0x63,
-0x0E,0xFC,0xEC,0x0B,   0,0x90,0xFF,0x63,
-   0,0xA3,0xFF,0xD2,0xA8,0xFA,0xFF,0x63,
-   0,0x0C,0xAD,0xF8,0xD8,0xBB,0xFF,0x63,
-   0,   0,   0,   0,   0,0x83,0xFF,0x63,
-   0,   0,   0,   0,   0,0x83,0xFF,0x63,
-   0,   0,   0,   0,   0,0x83,0xFF,0x63,
+   0,0x35,0xD3,0xF5,0xC1,0xBD,0xFF,0x68,
+0x01,0xDB,0xFD,0x44,0x40,0xFC,0xFF,0x68,
+0x37,0xFF,0xCA,   0,   0,0xC4,0xFF,0x68,
+0x56,0xFF,0xA9,   0,   0,0xA2,0xFF,0x68,
+0x57,0xFF,0xA8,   0,   0,0xA2,0xFF,0x68,
+0x37,0xFF,0xCA,   0,   0,0xC4,0xFF,0x68,
+0x01,0xDA,0xFD,0x44,0x40,0xFC,0xFF,0x68,
+   0,0x34,0xD2,0xF7,0xC4,0xBE,0xFF,0x68,
+   0,   0,   0,   0,   0,0x98,0xFF,0x68,
+   0,   0,   0,   0,   0,0x98,0xFF,0x68,
+   0,   0,   0,   0,   0,0x98,0xFF,0x68,
    0,   0,   0,   0,   0,   0,   0,   0,
 // 'r'
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5485,16 +4832,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,0x07,0xFF,0xC2,0x4D,0xD8,0xF9,0x88,
-   0,0x07,0xFF,0xEF,0xFA,0xFF,0xFF,0x7B,
-   0,0x07,0xFF,0xFF,0x7B,0x10,0x11,0x12,
-   0,0x07,0xFF,0xE2,   0,   0,   0,   0,
-   0,0x07,0xFF,0xDB,   0,   0,   0,   0,
-   0,0x07,0xFF,0xDB,   0,   0,   0,   0,
-   0,0x07,0xFF,0xDB,   0,   0,   0,   0,
-   0,0x07,0xFF,0xDB,   0,   0,   0,   0,
+   0,0x04,0xFF,0xFF,0x97,0xE1,0xFD,0xE0,
+   0,0x04,0xFF,0xFF,0xC5,0x1E,0x18,0x81,
+   0,0x04,0xFF,0xFF,0x2A,   0,   0,   0,
+   0,0x04,0xFF,0xFF,0x04,   0,   0,   0,
+   0,0x04,0xFF,0xFF,   0,   0,   0,   0,
+   0,0x04,0xFF,0xFF,   0,   0,   0,   0,
+   0,0x04,0xFF,0xFF,   0,   0,   0,   0,
+   0,0x04,0xFF,0xFF,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5505,16 +4850,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,0x0E,0x94,0xE2,0xF4,0xCD,0x55,   0,
-   0,0xA3,0xFF,0xA5,0x84,0xE3,0xFE,0x3F,
-   0,0xDC,0xF6,0x0E,   0,0x35,0x83,0x40,
-   0,0x79,0xFF,0xEF,0xB3,0x75,0x16,   0,
-   0,   0,0x40,0x9F,0xE3,0xFF,0xF0,0x2A,
-0x0F,0x97,0x6F,   0,   0,0x72,0xFF,0x82,
-   0,0xCB,0xFD,0x92,0x6F,0xC7,0xFF,0x51,
-   0,0x16,0x9C,0xE3,0xF6,0xD2,0x63,   0,
+   0,0x11,0xA1,0xE9,0xEF,0xB4,0x2E,   0,
+   0,0x9C,0xFF,0x4B,0x0B,0x41,0x95,   0,
+   0,0xC8,0xFF,0x79,0x08,   0,   0,   0,
+   0,0x84,0xFF,0xFF,0xF3,0xAE,0x32,   0,
+   0,0x01,0x61,0xBA,0xF9,0xFF,0xF2,0x13,
+   0,   0,   0,   0,0x14,0xCD,0xFF,0x40,
+   0,0x90,0x59,0x16,0x12,0xC6,0xFB,0x1D,
+   0,0x20,0x9B,0xE1,0xF6,0xD2,0x56,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5523,18 +4866,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,0x73,0xFF,0x73,   0,   0,   0,
-   0,   0,0x73,0xFF,0x73,   0,   0,   0,
-0x23,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x37,
-0x11,0x7B,0xB7,0xFF,0xB7,0x7B,0x7B,0x1B,
-   0,   0,0x73,0xFF,0x73,   0,   0,   0,
-   0,   0,0x73,0xFF,0x73,   0,   0,   0,
-   0,   0,0x73,0xFF,0x74,   0,   0,   0,
-   0,   0,0x63,0xFF,0x91,   0,   0,   0,
-   0,   0,0x2C,0xFD,0xFA,0xAC,0xAF,0x52,
-   0,   0,   0,0x67,0xE2,0xFB,0xE0,0x54,
+   0,   0,0x48,0xFF,0xB8,   0,   0,   0,
+   0,   0,0x48,0xFF,0xB8,   0,   0,   0,
+0x3C,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x54,
+   0,   0,0x48,0xFF,0xB8,   0,   0,   0,
+   0,   0,0x48,0xFF,0xB8,   0,   0,   0,
+   0,   0,0x48,0xFF,0xB8,   0,   0,   0,
+   0,   0,0x48,0xFF,0xB8,   0,   0,   0,
+   0,   0,0x45,0xFF,0xB8,   0,   0,   0,
+   0,   0,0x27,0xFF,0xDF,0x11,   0,   0,
+   0,   0,   0,0x89,0xE9,0xFE,0xFF,0x54,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5545,16 +4886,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,0xF7,0xEB,   0,   0,0x63,0xFF,0x83,
-   0,0xF7,0xEB,   0,   0,0x63,0xFF,0x83,
-   0,0xF7,0xEB,   0,   0,0x63,0xFF,0x83,
-   0,0xF7,0xEB,   0,   0,0x63,0xFF,0x83,
-   0,0xF6,0xEC,   0,   0,0x63,0xFF,0x83,
-   0,0xDD,0xF9,0x06,   0,0x6D,0xFF,0x83,
-   0,0x9B,0xFF,0xB1,0x8B,0xEC,0xFF,0x83,
-   0,0x15,0xB6,0xF5,0xCB,0x65,0xFF,0x83,
+   0,0xE8,0xFF,0x18,   0,0xC0,0xFF,0x40,
+   0,0xE8,0xFF,0x18,   0,0xC0,0xFF,0x40,
+   0,0xE8,0xFF,0x18,   0,0xC0,0xFF,0x40,
+   0,0xE8,0xFF,0x18,   0,0xC0,0xFF,0x40,
+   0,0xE8,0xFF,0x18,   0,0xC0,0xFF,0x40,
+   0,0xE5,0xFF,0x1C,   0,0xCE,0xFF,0x40,
+   0,0xC3,0xFF,0x5D,0x30,0xFB,0xFF,0x40,
+   0,0x3B,0xD9,0xF4,0xC1,0xD7,0xFF,0x40,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5565,16 +4904,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,
-0x53,0xFF,0x9C,   0,   0,0x38,0xFF,0xB9,
-0x08,0xF1,0xE6,0x01,   0,0x81,0xFF,0x5F,
-   0,0x9F,0xFF,0x30,   0,0xCA,0xF7,0x0E,
-   0,0x45,0xFF,0x7B,0x15,0xFD,0xAB,   0,
-   0,0x03,0xE8,0xC5,0x5C,0xFF,0x51,   0,
-   0,   0,0x91,0xFD,0xB4,0xF0,0x07,   0,
-   0,   0,0x37,0xFF,0xFD,0x9D,   0,   0,
-   0,   0,   0,0xDC,0xFF,0x44,   0,   0,
+0x4E,0xFF,0xB5,   0,   0,0x46,0xFF,0xB8,
+0x09,0xF6,0xF3,0x05,   0,0x89,0xFF,0x6B,
+   0,0xB2,0xFF,0x3B,   0,0xCC,0xFF,0x1E,
+   0,0x64,0xFF,0x7E,0x11,0xFD,0xD0,   0,
+   0,0x17,0xFE,0xC1,0x53,0xFF,0x82,   0,
+   0,   0,0xC8,0xF9,0xA1,0xFF,0x35,   0,
+   0,   0,0x7A,0xFF,0xFB,0xE6,0x01,   0,
+   0,   0,0x2B,0xFF,0xFF,0x9A,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5585,16 +4922,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,
-0xBB,0xF8,0x01,0x96,0xD8,   0,0xB7,0xF9,
-0x90,0xFF,0x17,0xC1,0xFC,0x07,0xD4,0xD3,
-0x66,0xFF,0x35,0xED,0xFF,0x2E,0xF2,0xA8,
-0x3B,0xFF,0x6B,0xFB,0xCF,0x69,0xFF,0x7E,
-0x11,0xFF,0xB4,0xD2,0x96,0xB2,0xFF,0x53,
-   0,0xE6,0xF5,0xA2,0x64,0xF5,0xFF,0x29,
-   0,0xBC,0xFF,0x72,0x32,0xFF,0xFA,0x04,
-   0,0x91,0xFF,0x43,0x06,0xFA,0xD4,   0,
+0xEA,0xBE,   0,   0,   0,   0,0x50,0xFF,
+0xBE,0xE5,   0,   0,   0,   0,0x76,0xFF,
+0x91,0xFF,0x0B,0xB2,0xFF,0x20,0x9D,0xF9,
+0x65,0xFF,0x31,0xE6,0xFD,0x53,0xC4,0xD1,
+0x38,0xFF,0x70,0xFE,0xB0,0x86,0xEA,0xA5,
+0x0C,0xFE,0xCB,0xD5,0x68,0xCA,0xFF,0x79,
+   0,0xDF,0xFF,0x9C,0x30,0xFF,0xFF,0x4D,
+   0,0xB2,0xFF,0x64,0x03,0xF4,0xFF,0x21,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5605,16 +4940,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,
-0x12,0xEA,0xF4,0x23,   0,0x63,0xFF,0xB3,
-   0,0x5B,0xFF,0xC6,0x27,0xF3,0xF3,0x1E,
-   0,   0,0xBA,0xFF,0xF0,0xFF,0x6F,   0,
-   0,   0,0x23,0xF7,0xFF,0xCC,0x03,   0,
-   0,   0,0x32,0xFC,0xFF,0xDA,0x08,   0,
-   0,0x03,0xCC,0xFF,0xC2,0xFF,0x85,   0,
-   0,0x72,0xFF,0xA3,0x0B,0xDF,0xFA,0x2D,
-0x1E,0xF4,0xEA,0x14,   0,0x44,0xFF,0xC8,
+0x1D,0xF0,0xFF,0x35,   0,0xC7,0xFF,0x7D,
+   0,0x60,0xFF,0xBD,0x50,0xFF,0xCC,0x04,
+   0,   0,0xB2,0xFF,0xEB,0xF8,0x2B,   0,
+   0,   0,0x18,0xF1,0xFF,0x7D,   0,   0,
+   0,   0,0x42,0xFE,0xFF,0xB2,   0,   0,
+   0,0x0D,0xE0,0xF9,0xC2,0xFF,0x5E,   0,
+   0,0x9C,0xFF,0x8D,0x24,0xFA,0xEF,0x1A,
+0x49,0xFF,0xEE,0x11,   0,0x8F,0xFF,0xB5,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5625,19 +4958,17 @@
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-0x6F,0xFF,0x9D,   0,   0,0x01,0xE1,0xFF,
-0x0F,0xF5,0xF2,0x09,   0,0x40,0xFF,0xC7,
-   0,0x9A,0xFF,0x59,   0,0x9D,0xFF,0x5D,
-   0,0x30,0xFF,0xB7,0x09,0xF1,0xEB,0x07,
-   0,   0,0xC6,0xFC,0x6F,0xFF,0x88,   0,
-   0,   0,0x5B,0xFF,0xF2,0xFD,0x20,   0,
-   0,   0,0x07,0xEA,0xFF,0xB3,   0,   0,
-   0,   0,   0,0xA1,0xFF,0x48,   0,   0,
-   0,   0,0x17,0xF1,0xDC,0x01,   0,   0,
-   0,0x67,0xDC,0xFF,0x64,   0,   0,   0,
-   0,0xB2,0xEC,0x86,   0,   0,   0,   0,
+0x69,0xFF,0xAE,   0,   0,0x3A,0xFF,0xDF,
+0x11,0xF8,0xF7,0x0D,   0,0x8C,0xFF,0x89,
+   0,0xAB,0xFF,0x5B,   0,0xDE,0xFF,0x32,
+   0,0x4C,0xFF,0xB2,0x31,0xFF,0xDB,   0,
+   0,0x04,0xE9,0xF8,0x93,0xFF,0x84,   0,
+   0,   0,0x8E,0xFF,0xFD,0xFF,0x2D,   0,
+   0,   0,0x30,0xFF,0xFF,0xD6,   0,   0,
+   0,   0,   0,0xD2,0xFF,0x7F,   0,   0,
+   0,   0,0x01,0xE4,0xFF,0x29,   0,   0,
+   0,0x01,0x5D,0xFF,0xC5,   0,   0,   0,
+0x20,0xFF,0xFC,0xC9,0x23,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
 // 'z'
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5645,16 +4976,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,
-0x17,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x97,
-0x0E,0x9F,0x9F,0x9F,0xB3,0xFF,0xFF,0x59,
-   0,   0,   0,0x03,0xBC,0xFF,0x8C,   0,
-   0,   0,   0,0x8E,0xFF,0xBA,0x03,   0,
-   0,   0,0x5D,0xFF,0xDB,0x11,   0,   0,
-   0,0x33,0xF7,0xF2,0x2A,   0,   0,   0,
-0x10,0xE2,0xFF,0xD5,0x9F,0x9F,0x9F,0x7A,
-0x2F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC3,
+   0,0xBC,0xFF,0xFF,0xFF,0xFF,0xFF,0x64,
+   0,   0,   0,   0,0x42,0xFC,0xFF,0x5F,
+   0,   0,   0,0x1B,0xE9,0xFF,0xCD,0x08,
+   0,   0,0x05,0xC5,0xFF,0xEE,0x21,   0,
+   0,   0,0x90,0xFF,0xFE,0x4C,   0,   0,
+   0,0x56,0xFF,0xFF,0x84,   0,   0,   0,
+   0,0xDF,0xFF,0xBC,0x02,   0,   0,   0,
+   0,0xE4,0xFF,0xFF,0xFF,0xFF,0xFF,0x64,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5662,62 +4991,56 @@
 // '{'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,0x26,0xCB,0xF7,0xFF,0x34,
+   0,   0,   0,0x93,0xFF,0x6B,0x02,   0,
+   0,   0,   0,0xAE,0xFF,0x30,   0,   0,
+   0,   0,   0,0xB0,0xFF,0x2C,   0,   0,
+   0,   0,   0,0xBD,0xFF,0x26,   0,   0,
+   0,0x02,0x32,0xF4,0xF2,0x09,   0,   0,
+   0,0xCC,0xFF,0xF6,0x58,   0,   0,   0,
+   0,0x02,0x36,0xF6,0xEF,0x08,   0,   0,
+   0,   0,   0,0xBE,0xFF,0x26,   0,   0,
+   0,   0,   0,0xB0,0xFF,0x2C,   0,   0,
+   0,   0,   0,0xAE,0xFF,0x30,   0,   0,
+   0,   0,   0,0x93,0xFF,0x6A,0x02,   0,
+   0,   0,   0,0x26,0xCC,0xF8,0xFF,0x34,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,0x26,0xC2,0x7E,   0,
-   0,   0,   0,   0,0xC9,0xDE,0x29,   0,
-   0,   0,   0,0x17,0xFF,0x94,   0,   0,
-   0,   0,   0,0x2B,0xFF,0x8C,   0,   0,
-   0,   0,   0,0x37,0xFF,0x83,   0,   0,
-   0,   0,0x29,0xAD,0xFC,0x37,   0,   0,
-   0,   0,0xE3,0xFE,0x5C,   0,   0,   0,
-   0,   0,0x57,0xD6,0xE4,0x14,   0,   0,
-   0,   0,   0,0x4A,0xFF,0x6C,   0,   0,
-   0,   0,   0,0x2C,0xFF,0x8A,   0,   0,
-   0,   0,   0,0x28,0xFF,0x8D,   0,   0,
-   0,   0,   0,0x0F,0xFF,0x9E,   0,   0,
-   0,   0,   0,   0,0xBD,0xE3,0x12,   0,
-   0,   0,   0,   0,0x25,0xE4,0x8E,   0,
-   0,   0,   0,   0,   0,0x06,0x0E,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
 // '|'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,0x5B,0xD3,   0,   0,   0,
-   0,   0,   0,0x5B,0xD3,   0,   0,   0,
-   0,   0,   0,0x5B,0xD3,   0,   0,   0,
-   0,   0,   0,0x5B,0xD3,   0,   0,   0,
-   0,   0,   0,0x5B,0xD3,   0,   0,   0,
-   0,   0,   0,0x5B,0xD3,   0,   0,   0,
-   0,   0,   0,0x5B,0xD3,   0,   0,   0,
-   0,   0,   0,0x5B,0xD3,   0,   0,   0,
-   0,   0,   0,0x5B,0xD3,   0,   0,   0,
-   0,   0,   0,0x5B,0xD3,   0,   0,   0,
-   0,   0,   0,0x5B,0xD3,   0,   0,   0,
-   0,   0,   0,0x5B,0xD3,   0,   0,   0,
-   0,   0,   0,0x5B,0xD3,   0,   0,   0,
-   0,   0,   0,0x5B,0xD3,   0,   0,   0,
+   0,   0,   0,0x90,0xFC,   0,   0,   0,
+   0,   0,   0,0x90,0xFC,   0,   0,   0,
+   0,   0,   0,0x90,0xFC,   0,   0,   0,
+   0,   0,   0,0x90,0xFC,   0,   0,   0,
+   0,   0,   0,0x90,0xFC,   0,   0,   0,
+   0,   0,   0,0x90,0xFC,   0,   0,   0,
+   0,   0,   0,0x90,0xFC,   0,   0,   0,
+   0,   0,   0,0x90,0xFC,   0,   0,   0,
+   0,   0,   0,0x90,0xFC,   0,   0,   0,
+   0,   0,   0,0x90,0xFC,   0,   0,   0,
+   0,   0,   0,0x90,0xFC,   0,   0,   0,
+   0,   0,   0,0x90,0xFC,   0,   0,   0,
+   0,   0,   0,0x90,0xFC,   0,   0,   0,
+   0,   0,   0,0x90,0xFC,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
 // '}'
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
+   0,0xC4,0xFC,0xE5,0x6E,   0,   0,   0,
+   0,   0,0x17,0xE9,0xF8,0x02,   0,   0,
+   0,   0,   0,0xC1,0xFF,0x16,   0,   0,
+   0,   0,   0,0xBC,0xFF,0x18,   0,   0,
+   0,   0,   0,0xB7,0xFF,0x24,   0,   0,
+   0,   0,   0,0x8E,0xFF,0x89,0x0A,   0,
+   0,   0,   0,0x11,0xD1,0xFF,0xFF,0x38,
+   0,   0,   0,0x8B,0xFF,0x8C,0x0B,   0,
+   0,   0,   0,0xB6,0xFF,0x25,   0,   0,
+   0,   0,   0,0xBC,0xFF,0x18,   0,   0,
+   0,   0,   0,0xC1,0xFF,0x16,   0,   0,
+   0,   0,0x17,0xE9,0xF8,0x02,   0,   0,
+   0,0xC4,0xFD,0xE6,0x6F,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,0x93,0xC1,0x19,   0,   0,   0,
-   0,   0,0x32,0xEA,0xB9,   0,   0,   0,
-   0,   0,   0,0xA9,0xFE,0x06,   0,   0,
-   0,   0,   0,0xA0,0xFF,0x17,   0,   0,
-   0,   0,   0,0x96,0xFF,0x22,   0,   0,
-   0,   0,   0,0x4B,0xFF,0xA1,0x26,   0,
-   0,   0,   0,   0,0x7F,0xFF,0xCF,   0,
-   0,   0,   0,0x21,0xF1,0xD0,0x52,   0,
-   0,   0,   0,0x81,0xFF,0x31,   0,   0,
-   0,   0,   0,0x9E,0xFF,0x18,   0,   0,
-   0,   0,   0,0xA1,0xFF,0x14,   0,   0,
-   0,   0,   0,0xB3,0xF6,0x01,   0,   0,
-   0,   0,0x1C,0xEF,0xA8,   0,   0,   0,
-   0,   0,0xA2,0xDA,0x1A,   0,   0,   0,
-   0,   0,0x10,0x04,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
 // '~'
    0,   0,   0,   0,   0,   0,   0,   0,
@@ -5727,11 +5050,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,
-0x1D,0xC7,0xF5,0xB4,0x24,   0,0x59,0x72,
-0x9F,0xF4,0xB5,0xF6,0xF6,0xB8,0xF7,0x9D,
-0x72,0x52,   0,0x24,0xB7,0xF7,0xC6,0x1B,
+0x16,0xAC,0xF1,0xD8,0x72,0x14,0x28,0x8A,
+0x64,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD4,
+0x51,0x53,0x0D,0x31,0x9D,0xF1,0xD7,0x4C,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
    0,   0,   0,   0,   0,   0,   0,   0,
diff --git a/src/libANGLE/Overlay_font_autogen.h b/src/libANGLE/Overlay_font_autogen.h
index ab8a522..333c0ee 100644
--- a/src/libANGLE/Overlay_font_autogen.h
+++ b/src/libANGLE/Overlay_font_autogen.h
@@ -1,5 +1,5 @@
 // GENERATED FILE - DO NOT EDIT.
-// Generated by gen_overlay_fonts.py using overlay/RobotoMono-Bold.ttf.
+// Generated by gen_overlay_fonts.py using overlay/DejaVuSansMono-Bold.ttf.
 //
 // Copyright 2022 The ANGLE Project Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
@@ -17,10 +17,10 @@
 constexpr uint32_t kFontMipCount                     = 2;
 constexpr uint32_t kFontCharacters                   = 95;
 constexpr uint32_t kFontGlyphWidth                   = 17;
-constexpr uint32_t kFontGlyphHeight                  = 39;
-constexpr uint32_t kFontMipDataSize[kFontMipCount]   = {62985, 14440};
-constexpr uint32_t kFontMipDataOffset[kFontMipCount] = {0, 62985};
-constexpr uint32_t kFontTotalDataSize                = 77425;
+constexpr uint32_t kFontGlyphHeight                  = 34;
+constexpr uint32_t kFontMipDataSize[kFontMipCount]   = {54910, 12920};
+constexpr uint32_t kFontMipDataOffset[kFontMipCount] = {0, 54910};
+constexpr uint32_t kFontTotalDataSize                = 67830;
 constexpr uint32_t kFontMipLarge                     = 0;
 constexpr uint32_t kFontMipSmall                     = 1;
 }  // namespace overlay
diff --git a/src/libANGLE/capture/FrameCapture.cpp b/src/libANGLE/capture/FrameCapture.cpp
index e90c9d1..07c1e93 100644
--- a/src/libANGLE/capture/FrameCapture.cpp
+++ b/src/libANGLE/capture/FrameCapture.cpp
@@ -3678,7 +3678,7 @@
     if (currentUnpackState.alignment != 1)
     {
         cap(CapturePixelStorei(replayState, true, GL_UNPACK_ALIGNMENT, 1));
-        replayState.setUnpackAlignment(1);
+        currentUnpackState.alignment = 1;
     }
 
     // Capture Texture setup and data.
@@ -4255,7 +4255,7 @@
     if (savedUnpackAlignment != currentUnpackState.alignment)
     {
         cap(CapturePixelStorei(replayState, true, GL_UNPACK_ALIGNMENT, savedUnpackAlignment));
-        replayState.setUnpackAlignment(savedUnpackAlignment);
+        currentUnpackState.alignment = savedUnpackAlignment;
     }
 }
 
@@ -4394,7 +4394,7 @@
     if (currentUnpackState.alignment != 1)
     {
         cap(CapturePixelStorei(replayState, true, GL_UNPACK_ALIGNMENT, 1));
-        replayState.setUnpackAlignment(1);
+        currentUnpackState.alignment = 1;
     }
 
     // Capture Texture setup and data.
@@ -5164,7 +5164,7 @@
     if (savedUnpackAlignment != currentUnpackState.alignment)
     {
         cap(CapturePixelStorei(replayState, true, GL_UNPACK_ALIGNMENT, savedUnpackAlignment));
-        replayState.setUnpackAlignment(savedUnpackAlignment);
+        currentUnpackState.alignment = savedUnpackAlignment;
     }
 
     if (validationEnabled)
diff --git a/src/libANGLE/gen_overlay_fonts.py b/src/libANGLE/gen_overlay_fonts.py
index ed88ad7..dce3b13 100644
--- a/src/libANGLE/gen_overlay_fonts.py
+++ b/src/libANGLE/gen_overlay_fonts.py
@@ -26,20 +26,7 @@
 
 out_file_cpp = 'Overlay_font_autogen.cpp'
 out_file_h = 'Overlay_font_autogen.h'
-font_file = 'overlay/RobotoMono-Bold.ttf'
-font_license = u"""// Font copyright Google:
-//
-//     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."""
+font_file = 'overlay/DejaVuSansMono-Bold.ttf'
 
 template_out_file_h = u"""// GENERATED FILE - DO NOT EDIT.
 // Generated by {script_name} using {font_file}.
@@ -77,8 +64,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-{font_license}
-//
 // {out_file_name}:
 //   Autogenerated overlay font data.
 
@@ -236,7 +221,6 @@
             template_out_file_cpp.format(
                 script_name=os.path.basename(__file__),
                 font_file=font_file,
-                font_license=font_license,
                 out_file_name=out_file_cpp,
                 total_font_data_size=total_font_data_size,
                 all_font_data=font_data))
diff --git a/src/libANGLE/overlay/DejaVuSansMono-Bold.ttf b/src/libANGLE/overlay/DejaVuSansMono-Bold.ttf
new file mode 100644
index 0000000..1ad83dd
--- /dev/null
+++ b/src/libANGLE/overlay/DejaVuSansMono-Bold.ttf
Binary files differ
diff --git a/src/libANGLE/overlay/LICENSE.txt b/src/libANGLE/overlay/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/src/libANGLE/overlay/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 [yyyy] [name of copyright owner]
-
-   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/src/libANGLE/overlay/RobotoMono-Bold.ttf b/src/libANGLE/overlay/RobotoMono-Bold.ttf
deleted file mode 100644
index 9845c77..0000000
--- a/src/libANGLE/overlay/RobotoMono-Bold.ttf
+++ /dev/null
Binary files differ
diff --git a/src/libANGLE/renderer/serial_utils.h b/src/libANGLE/renderer/serial_utils.h
index 7c116a6..ec5f4e8 100644
--- a/src/libANGLE/renderer/serial_utils.h
+++ b/src/libANGLE/renderer/serial_utils.h
@@ -160,8 +160,9 @@
     SerialBaseType mSerial;
 };
 
-using SerialFactory       = SerialFactoryBase<uint64_t>;
-using AtomicSerialFactory = SerialFactoryBase<std::atomic<uint64_t>>;
+using SerialFactory           = SerialFactoryBase<uint64_t>;
+using AtomicSerialFactory     = SerialFactoryBase<std::atomic<uint64_t>>;
+using RenderPassSerialFactory = SerialFactoryBase<uint64_t>;
 
 // For backend that supports multiple queue serials, QueueSerial includes a Serial and an index.
 using SerialIndex                                     = uint32_t;
diff --git a/src/libANGLE/renderer/vulkan/CommandProcessor.cpp b/src/libANGLE/renderer/vulkan/CommandProcessor.cpp
index b46ddb4..ecf5eb6 100644
--- a/src/libANGLE/renderer/vulkan/CommandProcessor.cpp
+++ b/src/libANGLE/renderer/vulkan/CommandProcessor.cpp
@@ -1496,7 +1496,7 @@
                                               const Serials &serials,
                                               Shared<Fence> **fenceToWaitOnOut)
 {
-    if (renderer->getLargestQueueSerialIndexEverAllocated() < 64)
+    if (renderer->getLargestAllocatedQueueSerialIndex() < 64)
     {
         return GetBatchCountUpToSerials<angle::BitSet64<64>>(
             mInFlightCommands, mLastSubmittedSerials, mLastCompletedSerials, serials,
diff --git a/src/libANGLE/renderer/vulkan/ContextVk.cpp b/src/libANGLE/renderer/vulkan/ContextVk.cpp
index 67c41de..2d89f25 100644
--- a/src/libANGLE/renderer/vulkan/ContextVk.cpp
+++ b/src/libANGLE/renderer/vulkan/ContextVk.cpp
@@ -6999,21 +6999,29 @@
     const vk::PackedAttachmentCount colorAttachmentCount,
     const vk::PackedAttachmentIndex depthStencilAttachmentIndex,
     const vk::PackedClearValuesArray &clearValues,
-    vk::RenderPassCommandBuffer **commandBufferOut)
+    vk::RenderPassCommandBuffer **commandBufferOut,
+    vk::RenderPassSerial *renderPassSerialOut)
 {
     // End any currently outstanding render pass. The render pass is normally closed before reaching
     // here for various reasons, except typically when UtilsVk needs to start one.
     ANGLE_TRY(flushCommandsAndEndRenderPass(RenderPassClosureReason::NewRenderPass));
 
+    // The last render pass serial is also incremented and used to update the render pass command
+    // buffer helper and the framebuffer object (via the output argument). Note that UtilsVk ignores
+    // the output serial.
+    ASSERT(renderPassSerialOut);
+    mCurrentRenderPassSerial = mRenderPassSerialFactory.generate();
+    *renderPassSerialOut     = mCurrentRenderPassSerial;
+
     // Now generate queueSerial for the renderPass.
     QueueSerial renderPassQueueSerial;
     generateRenderPassCommandsQueueSerial(&renderPassQueueSerial);
 
     mPerfCounters.renderPasses++;
-    ANGLE_TRY(mRenderPassCommands->beginRenderPass(this, framebuffer, renderArea, renderPassDesc,
-                                                   renderPassAttachmentOps, colorAttachmentCount,
-                                                   depthStencilAttachmentIndex, clearValues,
-                                                   renderPassQueueSerial, commandBufferOut));
+    ANGLE_TRY(mRenderPassCommands->beginRenderPass(
+        this, framebuffer, renderArea, renderPassDesc, renderPassAttachmentOps,
+        colorAttachmentCount, depthStencilAttachmentIndex, clearValues, mCurrentRenderPassSerial,
+        renderPassQueueSerial, commandBufferOut));
 
     if (mCurrentGraphicsPipeline)
     {
@@ -7057,7 +7065,7 @@
     return mRenderPassCommands->nextSubpass(this, &mRenderPassCommandBuffer);
 }
 
-void ContextVk::restoreFinishedRenderPass(const QueueSerial &queueSerial)
+void ContextVk::restoreFinishedRenderPass(const vk::RenderPassSerial renderPassSerial)
 {
     if (mRenderPassCommandBuffer != nullptr)
     {
@@ -7065,7 +7073,8 @@
         return;
     }
 
-    if (mRenderPassCommands->started() && mRenderPassCommands->getQueueSerial() == queueSerial)
+    if (mRenderPassCommands->started() &&
+        mRenderPassCommands->getRenderPassSerial() == renderPassSerial)
     {
         // There is already a render pass open for this framebuffer, so just restore the
         // pointer rather than starting a whole new render pass. One possible path here
diff --git a/src/libANGLE/renderer/vulkan/ContextVk.h b/src/libANGLE/renderer/vulkan/ContextVk.h
index 173de59..4ab7815 100644
--- a/src/libANGLE/renderer/vulkan/ContextVk.h
+++ b/src/libANGLE/renderer/vulkan/ContextVk.h
@@ -610,7 +610,8 @@
                                      const vk::PackedAttachmentCount colorAttachmentCount,
                                      const vk::PackedAttachmentIndex depthStencilAttachmentIndex,
                                      const vk::PackedClearValuesArray &clearValues,
-                                     vk::RenderPassCommandBuffer **commandBufferOut);
+                                     vk::RenderPassCommandBuffer **commandBufferOut,
+                                     vk::RenderPassSerial *renderPassSerialOut);
 
     // Only returns true if we have a started RP and we've run setupDraw.
     bool hasStartedRenderPass() const
@@ -619,9 +620,10 @@
         return mRenderPassCommandBuffer && mRenderPassCommands->started();
     }
 
-    bool hasStartedRenderPassWithQueueSerial(const QueueSerial &queueSerial) const
+    bool hasStartedRenderPassWithSerial(const vk::RenderPassSerial renderPassSerial) const
     {
-        return hasStartedRenderPass() && mRenderPassCommands->getQueueSerial() == queueSerial;
+        return hasStartedRenderPass() &&
+               mRenderPassCommands->getRenderPassSerial() == renderPassSerial;
     }
 
     bool hasStartedRenderPassWithCommands() const
@@ -636,7 +638,7 @@
     }
 
     // TODO(https://anglebug.com/4968): Support multiple open render passes.
-    void restoreFinishedRenderPass(const QueueSerial &queueSerial);
+    void restoreFinishedRenderPass(const vk::RenderPassSerial renderPassSerial);
 
     uint32_t getCurrentSubpassIndex() const;
     uint32_t getCurrentViewCount() const;
@@ -1558,6 +1560,10 @@
     // A graph built from pipeline descs and their transitions.
     std::ostringstream mPipelineCacheGraph;
 
+    // The latest serial used for a started render pass.
+    vk::RenderPassSerial mCurrentRenderPassSerial;
+    RenderPassSerialFactory mRenderPassSerialFactory;
+
     RangedSerialFactory mOutsideRenderPassSerialFactory;
 };
 
diff --git a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
index 7d8e78b..ec2a482 100644
--- a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
+++ b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
@@ -510,7 +510,7 @@
     {
         // If a render pass is open with commands, it must be for this framebuffer.  Otherwise,
         // either FramebufferVk::syncState() or ContextVk::syncState() would have closed it.
-        ASSERT(contextVk->hasStartedRenderPassWithQueueSerial(mLastRenderPassQueueSerial));
+        ASSERT(contextVk->hasStartedRenderPassWithSerial(mLastRenderPassSerial));
 
         // Emit debug-util markers for this mid-render-pass clear
         ANGLE_TRY(
@@ -1236,8 +1236,7 @@
             bool isCurrentFramebufferValid = srcFramebufferVk->mCurrentFramebuffer.valid();
             if (isCurrentFramebufferValid)
             {
-                contextVk->restoreFinishedRenderPass(
-                    srcFramebufferVk->getLastRenderPassQueueSerial());
+                contextVk->restoreFinishedRenderPass(srcFramebufferVk->getLastRenderPassSerial());
             }
 
             // glBlitFramebuffer() needs to copy the read color attachment to all enabled
@@ -1248,8 +1247,8 @@
             bool canResolveWithSubpass = isCurrentFramebufferValid &&
                                          mState.getEnabledDrawBuffers().count() == 1 &&
                                          mCurrentFramebufferDesc.getLayerCount() == 1 &&
-                                         contextVk->hasStartedRenderPassWithQueueSerial(
-                                             srcFramebufferVk->getLastRenderPassQueueSerial());
+                                         contextVk->hasStartedRenderPassWithSerial(
+                                             srcFramebufferVk->getLastRenderPassSerial());
 
             // Additionally, when resolving with a resolve attachment, the src and destination
             // offsets must match, the render area must match the resolve area, and there should be
@@ -1692,7 +1691,7 @@
     //- Bind FBO 2, draw
     //- Bind FBO 1, invalidate D/S
     // to invalidate the D/S of FBO 2 since it would be the currently active renderpass.
-    if (contextVk->hasStartedRenderPassWithQueueSerial(mLastRenderPassQueueSerial))
+    if (contextVk->hasStartedRenderPassWithSerial(mLastRenderPassSerial))
     {
         // Mark the invalidated attachments in the render pass for loadOp and storeOp determination
         // at its end.
@@ -2984,8 +2983,7 @@
 
     ANGLE_TRY(contextVk->beginNewRenderPass(
         framebuffer, renderArea, mRenderPassDesc, renderPassAttachmentOps, colorIndexVk,
-        depthStencilAttachmentIndex, packedClearValues, commandBufferOut));
-    mLastRenderPassQueueSerial = contextVk->getStartedRenderPassCommands().getQueueSerial();
+        depthStencilAttachmentIndex, packedClearValues, commandBufferOut, &mLastRenderPassSerial));
 
     // Add the images to the renderpass tracking list (through onColorDraw).
     vk::PackedAttachmentIndex colorAttachmentIndex(0);
diff --git a/src/libANGLE/renderer/vulkan/FramebufferVk.h b/src/libANGLE/renderer/vulkan/FramebufferVk.h
index 27f2b85..79abe70 100644
--- a/src/libANGLE/renderer/vulkan/FramebufferVk.h
+++ b/src/libANGLE/renderer/vulkan/FramebufferVk.h
@@ -146,7 +146,7 @@
 
     void releaseCurrentFramebuffer(ContextVk *contextVk);
 
-    const QueueSerial &getLastRenderPassQueueSerial() const { return mLastRenderPassQueueSerial; }
+    vk::RenderPassSerial getLastRenderPassSerial() const { return mLastRenderPassSerial; }
 
     enum class RenderTargetImage
     {
@@ -284,7 +284,7 @@
     bool mIsCurrentFramebufferCached;
 
     // Serial of the render pass this framebuffer has opened, if any.
-    QueueSerial mLastRenderPassQueueSerial;
+    vk::RenderPassSerial mLastRenderPassSerial;
 };
 }  // namespace rx
 
diff --git a/src/libANGLE/renderer/vulkan/ProgramExecutableVk.cpp b/src/libANGLE/renderer/vulkan/ProgramExecutableVk.cpp
index 0d5b117..7e7621d 100644
--- a/src/libANGLE/renderer/vulkan/ProgramExecutableVk.cpp
+++ b/src/libANGLE/renderer/vulkan/ProgramExecutableVk.cpp
@@ -190,8 +190,7 @@
                           angle::MemoryBuffer *cacheDataOut)
 {
     ASSERT(pipelineCache.valid() || contextVk->getState().isGLES1() ||
-           !contextVk->getFeatures().warmUpPipelineCacheAtLink.enabled ||
-           !contextVk->getFeatures().hasEffectivePipelineCacheSerialization.enabled);
+           !contextVk->getFeatures().warmUpPipelineCacheAtLink.enabled);
     if (!pipelineCache.valid() ||
         !contextVk->getFeatures().hasEffectivePipelineCacheSerialization.enabled)
     {
@@ -476,26 +475,6 @@
     return angle::Result::Continue;
 }
 
-angle::Result ProgramExecutableVk::ensurePipelineCacheInitialized(ContextVk *contextVk)
-{
-    if (!mPipelineCache.valid())
-    {
-        VkPipelineCacheCreateInfo pipelineCacheCreateInfo = {};
-        pipelineCacheCreateInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO;
-
-        if (contextVk->getFeatures().supportsPipelineCreationCacheControl.enabled)
-        {
-            pipelineCacheCreateInfo.flags |=
-                VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT_EXT;
-        }
-
-        ANGLE_VK_TRY(contextVk,
-                     mPipelineCache.init(contextVk->getDevice(), pipelineCacheCreateInfo));
-    }
-
-    return angle::Result::Continue;
-}
-
 std::unique_ptr<rx::LinkEvent> ProgramExecutableVk::load(ContextVk *contextVk,
                                                          const gl::ProgramExecutable &glExecutable,
                                                          bool isSeparable,
@@ -735,8 +714,6 @@
         return angle::Result::Continue;
     }
 
-    ANGLE_TRY(ensurePipelineCacheInitialized(contextVk));
-
     // No synchronization necessary when accessing the program executable's cache as there is no
     // access to it from other threads at this point.
     vk::PipelineCacheAccess pipelineCache;
@@ -1225,8 +1202,6 @@
     const bool useProgramPipelineCache = pipelineSubset == vk::GraphicsPipelineSubset::Shaders;
     if (useProgramPipelineCache)
     {
-        ANGLE_TRY(ensurePipelineCacheInitialized(contextVk));
-
         perProgramPipelineCache.init(&mPipelineCache, nullptr);
         pipelineCache = &perProgramPipelineCache;
     }
@@ -1439,6 +1414,29 @@
         ANGLE_TRY(contextVk->switchToFramebufferFetchMode(true));
     }
 
+    // Initialize the pipeline cache if not already.  The cache might have been initialized from
+    // data from the blob cache.  The per-program cache is used only when the context is not GLES1,
+    // and either warmUpPipelineCacheAtLink or supportsGraphicsPipelineLibrary are enabled.
+    //
+    const bool usePerProgramCache =
+        !contextVk->getState().isGLES1() &&
+        (contextVk->getFeatures().warmUpPipelineCacheAtLink.enabled ||
+         contextVk->getFeatures().supportsGraphicsPipelineLibrary.enabled);
+    if (!mPipelineCache.valid() && usePerProgramCache)
+    {
+        VkPipelineCacheCreateInfo pipelineCacheCreateInfo = {};
+        pipelineCacheCreateInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO;
+
+        if (contextVk->getFeatures().supportsPipelineCreationCacheControl.enabled)
+        {
+            pipelineCacheCreateInfo.flags |=
+                VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT_EXT;
+        }
+
+        ANGLE_VK_TRY(contextVk,
+                     mPipelineCache.init(contextVk->getDevice(), pipelineCacheCreateInfo));
+    }
+
     return angle::Result::Continue;
 }
 
diff --git a/src/libANGLE/renderer/vulkan/ProgramExecutableVk.h b/src/libANGLE/renderer/vulkan/ProgramExecutableVk.h
index 082154e..bd30d4b 100644
--- a/src/libANGLE/renderer/vulkan/ProgramExecutableVk.h
+++ b/src/libANGLE/renderer/vulkan/ProgramExecutableVk.h
@@ -348,11 +348,8 @@
                                              DescriptorSetIndex setIndex,
                                              vk::SharedDescriptorSetCacheKey *newSharedCacheKeyOut);
 
-    // When loading from cache / binary, initialize the pipeline cache with given data.  Otherwise
-    // the cache is lazily created as needed.
     angle::Result initializePipelineCache(ContextVk *contextVk,
                                           const std::vector<uint8_t> &compressedPipelineData);
-    angle::Result ensurePipelineCacheInitialized(ContextVk *contextVk);
 
     void resetLayout(ContextVk *contextVk);
 
diff --git a/src/libANGLE/renderer/vulkan/RendererVk.cpp b/src/libANGLE/renderer/vulkan/RendererVk.cpp
index 4828879..bafd137 100644
--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -210,13 +210,9 @@
     "VUID-vkCmdDrawIndirectCount-None-02686",
     "VUID-vkCmdDrawIndexedIndirect-None-02686",
     "VUID-vkCmdDrawIndexedIndirectCount-None-02686",
-    // http://anglebug.com/7729
     "VUID-vkDestroySemaphore-semaphore-01137",
     // http://anglebug.com/7843
     "VUID-VkGraphicsPipelineCreateInfo-Vertex-07722",
-    // http://anglebug.com/7861
-    "VUID-vkCmdDraw-None-06887",
-    "VUID-vkCmdDrawIndexed-None-06887",
 };
 
 // Validation messages that should be ignored only when VK_EXT_primitive_topology_list_restart is
diff --git a/src/libANGLE/renderer/vulkan/RendererVk.h b/src/libANGLE/renderer/vulkan/RendererVk.h
index 5937290..7868bdc 100644
--- a/src/libANGLE/renderer/vulkan/RendererVk.h
+++ b/src/libANGLE/renderer/vulkan/RendererVk.h
@@ -620,9 +620,9 @@
     }
 
     angle::Result allocateQueueSerialIndex(SerialIndex *indexOut, Serial *serialOut);
-    size_t getLargestQueueSerialIndexEverAllocated() const
+    size_t getLargestAllocatedQueueSerialIndex() const
     {
-        return mQueueSerialIndexAllocator.getLargestIndexEverAllocated();
+        return mQueueSerialIndexAllocator.getLarrgestAllocatedIndex();
     }
     void releaseQueueSerialIndex(SerialIndex index);
     Serial generateQueueSerial(SerialIndex index);
diff --git a/src/libANGLE/renderer/vulkan/UtilsVk.cpp b/src/libANGLE/renderer/vulkan/UtilsVk.cpp
index 2fcaeaa..860e3b5 100644
--- a/src/libANGLE/renderer/vulkan/UtilsVk.cpp
+++ b/src/libANGLE/renderer/vulkan/UtilsVk.cpp
@@ -2173,9 +2173,11 @@
                                               vk::ImageLayout::ColorAttachment,
                                               vk::ImageLayout::ColorAttachment);
 
-    ANGLE_TRY(contextVk->beginNewRenderPass(
-        framebuffer, renderArea, renderPassDesc, renderPassAttachmentOps,
-        vk::PackedAttachmentCount(1), vk::kAttachmentIndexInvalid, clearValues, commandBufferOut));
+    vk::RenderPassSerial renderPassSerial;
+    ANGLE_TRY(contextVk->beginNewRenderPass(framebuffer, renderArea, renderPassDesc,
+                                            renderPassAttachmentOps, vk::PackedAttachmentCount(1),
+                                            vk::kAttachmentIndexInvalid, clearValues,
+                                            commandBufferOut, &renderPassSerial));
 
     contextVk->addGarbage(&framebuffer.getFramebuffer());
 
@@ -2195,7 +2197,7 @@
     // Start a new render pass if not already started
     ANGLE_TRY(framebuffer->getFramebuffer(contextVk, &currentFramebuffer, nullptr, nullptr,
                                           SwapchainResolveMode::Disabled));
-    if (contextVk->hasStartedRenderPassWithQueueSerial(framebuffer->getLastRenderPassQueueSerial()))
+    if (contextVk->hasStartedRenderPassWithSerial(framebuffer->getLastRenderPassSerial()))
     {
         vk::RenderPassCommandBufferHelper *renderPassCommands =
             &contextVk->getStartedRenderPassCommands();
diff --git a/src/libANGLE/renderer/vulkan/vk_helpers.cpp b/src/libANGLE/renderer/vulkan/vk_helpers.cpp
index 9d1f09d..a4bc385 100644
--- a/src/libANGLE/renderer/vulkan/vk_helpers.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_helpers.cpp
@@ -2086,6 +2086,7 @@
     const PackedAttachmentCount colorAttachmentCount,
     const PackedAttachmentIndex depthStencilAttachmentIndex,
     const PackedClearValuesArray &clearValues,
+    const RenderPassSerial renderPassSerial,
     const QueueSerial &queueSerial,
     RenderPassCommandBuffer **commandBufferOut)
 {
@@ -2098,6 +2099,7 @@
     mFramebuffer                 = std::move(framebuffer);
     mRenderArea                  = renderArea;
     mClearValues                 = clearValues;
+    mRenderPassSerial            = renderPassSerial;
     mQueueSerial                 = queueSerial;
     *commandBufferOut            = &getCommandBuffer();
 
diff --git a/src/libANGLE/renderer/vulkan/vk_helpers.h b/src/libANGLE/renderer/vulkan/vk_helpers.h
index e17e5ee..f8bf8fa 100644
--- a/src/libANGLE/renderer/vulkan/vk_helpers.h
+++ b/src/libANGLE/renderer/vulkan/vk_helpers.h
@@ -1278,6 +1278,8 @@
     ImagelessStatus mImageless;
 };
 
+using RenderPassSerial = Serial;
+
 class RenderPassCommandBufferHelper final : public CommandBufferHelperCommon
 {
   public:
@@ -1341,6 +1343,7 @@
                                   const PackedAttachmentCount colorAttachmentCount,
                                   const PackedAttachmentIndex depthStencilAttachmentIndex,
                                   const PackedClearValuesArray &clearValues,
+                                  const RenderPassSerial renderPassSerial,
                                   const QueueSerial &queueSerial,
                                   RenderPassCommandBuffer **commandBufferOut);
 
@@ -1431,6 +1434,8 @@
     }
     void addCommandDiagnostics(ContextVk *contextVk);
 
+    RenderPassSerial getRenderPassSerial() const { return mRenderPassSerial; }
+
   private:
     angle::Result initializeCommandBuffer(Context *context);
     angle::Result beginRenderPassCommandBuffer(ContextVk *contextVk);
@@ -1513,6 +1518,10 @@
     // This is last renderpass before present and this is the image will be presented. We can use
     // final layout of the renderpass to transition it to the presentable layout
     ImageHelper *mImageOptimizeForPresent;
+
+    // This serial is updated when a render pass starts, and is used to identify the framebuffer
+    // that has opened it.
+    RenderPassSerial mRenderPassSerial;
 };
 
 // The following class helps support both Vulkan and ANGLE secondary command buffers by
diff --git a/src/libANGLE/renderer/vulkan/vk_utils.h b/src/libANGLE/renderer/vulkan/vk_utils.h
index 00e2486..98ae086 100644
--- a/src/libANGLE/renderer/vulkan/vk_utils.h
+++ b/src/libANGLE/renderer/vulkan/vk_utils.h
@@ -192,7 +192,7 @@
 class QueueSerialIndexAllocator final
 {
   public:
-    QueueSerialIndexAllocator() : mLargestIndexEverAllocated(kInvalidQueueSerialIndex)
+    QueueSerialIndexAllocator() : mLargestAllocatedIndex(kInvalidQueueSerialIndex)
     {
         // Start with every index is free
         mFreeIndexBitSetArray.set();
@@ -210,30 +210,28 @@
         SerialIndex index = static_cast<SerialIndex>(mFreeIndexBitSetArray.first());
         ASSERT(index < kMaxQueueSerialIndexCount);
         mFreeIndexBitSetArray.reset(index);
-        mLargestIndexEverAllocated = (~mFreeIndexBitSetArray).last();
+        mLargestAllocatedIndex = (~mFreeIndexBitSetArray).last();
         return index;
     }
 
     void release(SerialIndex index)
     {
         std::lock_guard<std::mutex> lock(mMutex);
-        ASSERT(index <= mLargestIndexEverAllocated);
+        ASSERT(index <= mLargestAllocatedIndex);
         ASSERT(!mFreeIndexBitSetArray.test(index));
         mFreeIndexBitSetArray.set(index);
-        // mLargestIndexEverAllocated is for optimization. Even if we released queueIndex, we may
-        // still have resources still have serial the index. Thus do not decrement
-        // mLargestIndexEverAllocated here. The only downside is that we may get into slightly less
-        // optimal code path in GetBatchCountUpToSerials.
+        if (index == mLargestAllocatedIndex)
+        {
+            mLargestAllocatedIndex = mFreeIndexBitSetArray.all() ? kInvalidQueueSerialIndex
+                                                                 : (~mFreeIndexBitSetArray).last();
+        }
     }
 
-    size_t getLargestIndexEverAllocated() const
-    {
-        return mLargestIndexEverAllocated.load(std::memory_order_consume);
-    }
+    size_t getLarrgestAllocatedIndex() const { return mLargestAllocatedIndex; }
 
   private:
     angle::BitSetArray<kMaxQueueSerialIndexCount> mFreeIndexBitSetArray;
-    std::atomic<size_t> mLargestIndexEverAllocated;
+    size_t mLargestAllocatedIndex;
     std::mutex mMutex;
 };
 
diff --git a/src/libANGLE/validationES.cpp b/src/libANGLE/validationES.cpp
index f9b6de6..365ad23 100644
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -5571,22 +5571,13 @@
             }
             break;
 
-        case GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE:
-            if (clientVersion < 3 && !context->getExtensions().colorBufferHalfFloatEXT &&
-                !context->getExtensions().colorBufferFloatRgbCHROMIUM &&
-                !context->getExtensions().colorBufferFloatRgbaCHROMIUM)
-            {
-                context->validationErrorF(entryPoint, GL_INVALID_ENUM, kEnumNotSupported, pname);
-                return false;
-            }
-            break;
-
         case GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE:
         case GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE:
         case GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE:
         case GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE:
         case GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE:
         case GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE:
+        case GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE:
         case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER:
             if (clientVersion < 3)
             {
diff --git a/src/tests/angle_end2end_tests_expectations.txt b/src/tests/angle_end2end_tests_expectations.txt
index 2073cfc..0ae8055 100644
--- a/src/tests/angle_end2end_tests_expectations.txt
+++ b/src/tests/angle_end2end_tests_expectations.txt
@@ -704,10 +704,6 @@
 6358 SWIFTSHADER : GLSLTest_ES3.UnsuccessfulRelinkWithBindAttribLocation/* = SKIP
 6358 METAL : GLSLTest_ES3.UnsuccessfulRelinkWithBindAttribLocation/* = SKIP
 
-// Assigning an assignment expression to swizzled vector field fails on Swiftshader
-7863 WIN SWIFTSHADER : GLSLTest_ES3.AssignAssignmentToSwizzled/* = SKIP
-7863 LINUX SWIFTSHADER : GLSLTest_ES3.AssignAssignmentToSwizzled/* = SKIP
-
 // HLSL compiler bug
 2445 D3D11 : GLSLTest_ES3.ComplexCrossExpression/* = SKIP
 
diff --git a/src/tests/gl_tests/FramebufferTest.cpp b/src/tests/gl_tests/FramebufferTest.cpp
index 0fb2cea..58ce405 100644
--- a/src/tests/gl_tests/FramebufferTest.cpp
+++ b/src/tests/gl_tests/FramebufferTest.cpp
@@ -5251,94 +5251,11 @@
     ASSERT_EGL_SUCCESS();
 }
 
-class FramebufferExtensionsTest : public FramebufferTest
-{
-  protected:
-    FramebufferExtensionsTest() { setExtensionsEnabled(false); }
-
-    void checkParameter(GLenum expectedComponentType)
-    {
-        GLint componentType = 0;
-        glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                                              GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT,
-                                              &componentType);
-        EXPECT_EQ(componentType, static_cast<GLint>(expectedComponentType));
-        if (expectedComponentType)
-        {
-            EXPECT_GL_NO_ERROR();
-        }
-        else
-        {
-            EXPECT_GL_ERROR(GL_INVALID_ENUM);
-        }
-    }
-
-    void checkTexture(GLenum format, GLenum type, GLenum expectedComponentType)
-    {
-        GLTexture texture;
-        glBindTexture(GL_TEXTURE_2D, texture);
-        glTexImage2D(GL_TEXTURE_2D, 0, format, 8, 8, 0, format, type, nullptr);
-        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
-        ASSERT_GL_NO_ERROR();
-        checkParameter(expectedComponentType);
-    }
-
-    void checkRenderbuffer(GLenum format, GLenum expectedComponentType)
-    {
-        GLRenderbuffer renderbuffer;
-        glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer);
-        glRenderbufferStorage(GL_RENDERBUFFER, format, 8, 8);
-        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
-                                  renderbuffer);
-        ASSERT_GL_NO_ERROR();
-        checkParameter(expectedComponentType);
-    }
-
-    void test(const char *extensionName, GLenum format, bool supportsRenderbuffer)
-    {
-        GLFramebuffer fbo;
-        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-        checkTexture(GL_RGBA, GL_UNSIGNED_BYTE, 0);
-        checkRenderbuffer(GL_RGB565, 0);
-
-        ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled(extensionName));
-
-        checkTexture(GL_RGBA, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED_EXT);
-        checkRenderbuffer(GL_RGB565, GL_UNSIGNED_NORMALIZED_EXT);
-
-        if (supportsRenderbuffer)
-            checkRenderbuffer(format, GL_FLOAT);
-    }
-};
-
-// Tests that GL_EXT_color_buffer_half_float enables component type state queries on
-// framebuffer attachments.
-TEST_P(FramebufferExtensionsTest, ColorBufferHalfFloat)
-{
-    ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_OES_texture_half_float"));
-    test("GL_EXT_color_buffer_half_float", GL_RGBA16F_EXT, true);
-}
-
-// Tests that GL_CHROMIUM_color_buffer_float_rgb enables component type state queries on
-// framebuffer attachments.
-TEST_P(FramebufferExtensionsTest, ColorBufferFloatRgb)
-{
-    test("GL_CHROMIUM_color_buffer_float_rgb", GL_RGB32F_EXT, false);
-}
-
-// Tests that GL_CHROMIUM_color_buffer_float_rgba enables component type state queries on
-// framebuffer attachments.
-TEST_P(FramebufferExtensionsTest, ColorBufferFloatRgba)
-{
-    test("GL_CHROMIUM_color_buffer_float_rgba", GL_RGBA32F_EXT, true);
-}
-
 ANGLE_INSTANTIATE_TEST_ES2_AND(AddMockTextureNoRenderTargetTest,
                                ES2_D3D9().enable(Feature::AddMockTextureNoRenderTarget),
                                ES2_D3D11().enable(Feature::AddMockTextureNoRenderTarget));
 
 ANGLE_INSTANTIATE_TEST_ES2(FramebufferTest);
-ANGLE_INSTANTIATE_TEST_ES2(FramebufferExtensionsTest);
 ANGLE_INSTANTIATE_TEST_ES2_AND_ES3(FramebufferFormatsTest);
 
 GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(FramebufferTest_ES3);
diff --git a/third_party/r8/lib/r8.jar b/third_party/r8/lib/r8.jar
index 085f502..4465d9b 100644
--- a/third_party/r8/lib/r8.jar
+++ b/third_party/r8/lib/r8.jar
Binary files differ
diff --git a/third_party/turbine/turbine.jar b/third_party/turbine/turbine.jar
index 270b80d..5e07444 100644
--- a/third_party/turbine/turbine.jar
+++ b/third_party/turbine/turbine.jar
Binary files differ
diff --git a/third_party/vulkan-deps/DEPS b/third_party/vulkan-deps/DEPS
index 8b741c5..9473530 100644
--- a/third_party/vulkan-deps/DEPS
+++ b/third_party/vulkan-deps/DEPS
@@ -9,28 +9,28 @@
   'chromium_git': 'https://chromium.googlesource.com',
 
   # Current revision of glslang, the Khronos SPIRV compiler.
-  'glslang_revision': 'a7603c132d0dd1476eb8e13e50d042820f2154a7',
+  'glslang_revision': '88fd417b0bb7d91755961c70e846d274c182f2b0',
 
   # Current revision of spirv-cross, the Khronos SPIRV cross compiler.
   'spirv_cross_revision': 'c77b09b57c27837dc2d41aa371ed3d236ce9ce47',
 
   # Current revision fo the SPIRV-Headers Vulkan support library.
-  'spirv_headers_revision': '1d31a100405cf8783ca7a31e31cdd727c9fc54c3',
+  'spirv_headers_revision': 'c214f6f2d1a7253bb0e9f195c2dc5b0659dc99ef',
 
   # Current revision of SPIRV-Tools for Vulkan.
-  'spirv_tools_revision': '40f5bf59c6acb4754a0bffd3c53a715732883a12',
+  'spirv_tools_revision': '46ca66e6991f16c89e17ebc9b86995143be2c706',
 
   # Current revision of Khronos Vulkan-Headers.
-  'vulkan_headers_revision': '891c40de1ae1a02b6e2475e1e9684e0fc94fff27',
+  'vulkan_headers_revision': 'b092b2fccc812453c1d0ec0a829eb8f34f174803',
 
   # Current revision of Khronos Vulkan-Loader.
-  'vulkan_loader_revision': '82d4232f0f348f66582dd4d5ac15cdb449e08ca1',
+  'vulkan_loader_revision': '3a092fe869f6c5f152aa9a52b8064bb9b6bf9c93',
 
   # Current revision of Khronos Vulkan-Tools.
-  'vulkan_tools_revision': 'ce45337c51ed53e6f1b337aa746a5a96c5018f86',
+  'vulkan_tools_revision': 'ec541c410e94f690c734128d2a8414f21f98b966',
 
   # Current revision of Khronos Vulkan-ValidationLayers.
-  'vulkan_validation_revision': '1f2848428cf15ddacd4cfba5e8d85004793d02b6',
+  'vulkan_validation_revision': '7a9d51a51c4daf3126d3a141b35226b37e69a9a4',
 }
 
 deps = {
diff --git a/third_party/vulkan-deps/glslang/src/OGLCompilersDLL/InitializeDll.cpp b/third_party/vulkan-deps/glslang/src/OGLCompilersDLL/InitializeDll.cpp
index 9d81f57..abea910 100644
--- a/third_party/vulkan-deps/glslang/src/OGLCompilersDLL/InitializeDll.cpp
+++ b/third_party/vulkan-deps/glslang/src/OGLCompilersDLL/InitializeDll.cpp
@@ -102,7 +102,7 @@
         return false;
     }
 
-    if (OS_GetTLSValue(ThreadInitializeIndex) != nullptr)
+    if (OS_GetTLSValue(ThreadInitializeIndex) != 0)
         return true;
 
     if (! OS_SetTLSValue(ThreadInitializeIndex, (void *)1)) {
@@ -130,8 +130,8 @@
     //
     // Function is re-entrant and this thread may not have been initialized.
     //
-    if (OS_GetTLSValue(ThreadInitializeIndex) != nullptr) {
-        if (!OS_SetTLSValue(ThreadInitializeIndex, nullptr)) {
+    if (OS_GetTLSValue(ThreadInitializeIndex) != 0) {
+        if (!OS_SetTLSValue(ThreadInitializeIndex, (void *)0)) {
             assert(0 && "DetachThread(): Unable to clear init flag.");
             success = false;
         }
diff --git a/third_party/vulkan-deps/glslang/src/SPIRV/GlslangToSpv.cpp b/third_party/vulkan-deps/glslang/src/SPIRV/GlslangToSpv.cpp
index 11fc70c..842221c 100644
--- a/third_party/vulkan-deps/glslang/src/SPIRV/GlslangToSpv.cpp
+++ b/third_party/vulkan-deps/glslang/src/SPIRV/GlslangToSpv.cpp
@@ -9615,7 +9615,7 @@
 {
     TIntermNode* root = intermediate.getTreeRoot();
 
-    if (root == nullptr)
+    if (root == 0)
         return;
 
     SpvOptions defaultOptions;
diff --git a/third_party/vulkan-deps/glslang/src/SPIRV/SpvBuilder.cpp b/third_party/vulkan-deps/glslang/src/SPIRV/SpvBuilder.cpp
index 7b2d703..7c5ea87 100644
--- a/third_party/vulkan-deps/glslang/src/SPIRV/SpvBuilder.cpp
+++ b/third_party/vulkan-deps/glslang/src/SPIRV/SpvBuilder.cpp
@@ -71,9 +71,9 @@
     addressModel(AddressingModelLogical),
     memoryModel(MemoryModelGLSL450),
     builderNumber(magicNumber),
-    buildPoint(nullptr),
+    buildPoint(0),
     uniqueId(0),
-    entryPointFunction(nullptr),
+    entryPointFunction(0),
     generatingOpCodeForSpecConst(false),
     logger(buildLogger)
 {
@@ -1675,7 +1675,7 @@
 
 Id Builder::findCompositeConstant(Op typeClass, Id typeId, const std::vector<Id>& comps)
 {
-    Instruction* constant = nullptr;
+    Instruction* constant = 0;
     bool found = false;
     for (int i = 0; i < (int)groupedConstants[typeClass].size(); ++i) {
         constant = groupedConstants[typeClass][i];
@@ -1702,7 +1702,7 @@
 
 Id Builder::findStructConstant(Id typeId, const std::vector<Id>& comps)
 {
-    Instruction* constant = nullptr;
+    Instruction* constant = 0;
     bool found = false;
     for (int i = 0; i < (int)groupedStructConstants[typeId].size(); ++i) {
         constant = groupedStructConstants[typeId][i];
@@ -3332,7 +3332,7 @@
     builder(gb),
     condition(cond),
     control(ctrl),
-    elseBlock(nullptr)
+    elseBlock(0)
 {
     function = &builder.getBuildPoint()->getParent();
 
diff --git a/third_party/vulkan-deps/glslang/src/SPIRV/SpvBuilder.h b/third_party/vulkan-deps/glslang/src/SPIRV/SpvBuilder.h
index b75eab8..f7fdc6a 100644
--- a/third_party/vulkan-deps/glslang/src/SPIRV/SpvBuilder.h
+++ b/third_party/vulkan-deps/glslang/src/SPIRV/SpvBuilder.h
@@ -414,7 +414,7 @@
     // The returned pointer is only valid for the lifetime of this builder.
     Function* makeFunctionEntry(Decoration precision, Id returnType, const char* name,
         const std::vector<Id>& paramTypes, const std::vector<char const*>& paramNames,
-        const std::vector<std::vector<Decoration>>& precisions, Block **entry = nullptr);
+        const std::vector<std::vector<Decoration>>& precisions, Block **entry = 0);
 
     // Create a return. An 'implicit' return is one not appearing in the source
     // code.  In the case of an implicit return, no post-return block is inserted.
diff --git a/third_party/vulkan-deps/glslang/src/SPIRV/SpvTools.cpp b/third_party/vulkan-deps/glslang/src/SPIRV/SpvTools.cpp
index 1b26280..2529993 100644
--- a/third_party/vulkan-deps/glslang/src/SPIRV/SpvTools.cpp
+++ b/third_party/vulkan-deps/glslang/src/SPIRV/SpvTools.cpp
@@ -212,7 +212,8 @@
     optimizer.RegisterPass(spvtools::CreateInterpolateFixupPass());
     if (options->optimizeSize) {
         optimizer.RegisterPass(spvtools::CreateRedundancyEliminationPass());
-        optimizer.RegisterPass(spvtools::CreateEliminateDeadInputComponentsSafePass());
+        if (intermediate.getStage() == EShLanguage::EShLangVertex)
+            optimizer.RegisterPass(spvtools::CreateEliminateDeadInputComponentsPass());
     }
     optimizer.RegisterPass(spvtools::CreateAggressiveDCEPass());
     optimizer.RegisterPass(spvtools::CreateCFGCleanupPass());
@@ -223,56 +224,6 @@
     optimizer.Run(spirv.data(), spirv.size(), &spirv, spvOptOptions);
 }
 
-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* logger)
-{
-  spvtools::Optimizer optimizer(target_env);
-  optimizer.SetMessageConsumer(OptimizerMesssageConsumer);
-
-  optimizer.RegisterPass(spvtools::CreateAnalyzeLiveInputPass(live_locs, live_builtins));
-
-  spvtools::OptimizerOptions spvOptOptions;
-  optimizer.SetTargetEnv(target_env);
-  spvOptOptions.set_run_validator(false);
-  return optimizer.Run(spirv.data(), spirv.size(), &spirv, spvOptOptions);
-}
-
-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* logger)
-{
-  spvtools::Optimizer optimizer(target_env);
-  optimizer.SetMessageConsumer(OptimizerMesssageConsumer);
-
-  optimizer.RegisterPass(spvtools::CreateEliminateDeadOutputStoresPass(live_locs, live_builtins));
-  optimizer.RegisterPass(spvtools::CreateAggressiveDCEPass(false, true));
-  optimizer.RegisterPass(spvtools::CreateEliminateDeadOutputComponentsPass());
-  optimizer.RegisterPass(spvtools::CreateAggressiveDCEPass(false, true));
-
-  spvtools::OptimizerOptions spvOptOptions;
-  optimizer.SetTargetEnv(target_env);
-  spvOptOptions.set_run_validator(false);
-  optimizer.Run(spirv.data(), spirv.size(), &spirv, spvOptOptions);
-}
-
-void SpirvToolsEliminateDeadInputComponents(spv_target_env target_env, std::vector<unsigned int>& spirv,
-                                            spv::SpvBuildLogger* logger)
-{
-  spvtools::Optimizer optimizer(target_env);
-  optimizer.SetMessageConsumer(OptimizerMesssageConsumer);
-
-  optimizer.RegisterPass(spvtools::CreateEliminateDeadInputComponentsPass());
-  optimizer.RegisterPass(spvtools::CreateAggressiveDCEPass());
-
-  spvtools::OptimizerOptions spvOptOptions;
-  optimizer.SetTargetEnv(target_env);
-  spvOptOptions.set_run_validator(false);
-  optimizer.Run(spirv.data(), spirv.size(), &spirv, spvOptOptions);
-}
-
 // 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.
diff --git a/third_party/vulkan-deps/glslang/src/SPIRV/SpvTools.h b/third_party/vulkan-deps/glslang/src/SPIRV/SpvTools.h
index 6fc4e40..5386048 100644
--- a/third_party/vulkan-deps/glslang/src/SPIRV/SpvTools.h
+++ b/third_party/vulkan-deps/glslang/src/SPIRV/SpvTools.h
@@ -65,9 +65,6 @@
 
 #if ENABLE_OPT
 
-// Translate glslang's view of target versioning to what SPIRV-Tools uses.
-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.
 void SpirvToolsDisassemble(std::ostream& out, const std::vector<unsigned int>& spirv);
 
@@ -83,22 +80,6 @@
 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|.
-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.
-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|.
-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.
diff --git a/third_party/vulkan-deps/glslang/src/SPIRV/doc.cpp b/third_party/vulkan-deps/glslang/src/SPIRV/doc.cpp
index b6cc42d..b7fe3e7 100644
--- a/third_party/vulkan-deps/glslang/src/SPIRV/doc.cpp
+++ b/third_party/vulkan-deps/glslang/src/SPIRV/doc.cpp
@@ -1607,7 +1607,7 @@
     DecorationOperands[DecorationInputAttachmentIndex].push(OperandLiteralNumber, "'Attachment Index'");
     DecorationOperands[DecorationAlignment].push(OperandLiteralNumber, "'Alignment'");
 
-    OperandClassParams[OperandSource].set(0, SourceString, nullptr);
+    OperandClassParams[OperandSource].set(0, SourceString, 0);
     OperandClassParams[OperandExecutionModel].set(0, ExecutionModelString, nullptr);
     OperandClassParams[OperandAddressing].set(0, AddressingString, nullptr);
     OperandClassParams[OperandMemory].set(0, MemoryString, nullptr);
@@ -1639,7 +1639,7 @@
     OperandClassParams[OperandKernelEnqueueFlags].set(0, KernelEnqueueFlagsString, nullptr);
     OperandClassParams[OperandKernelProfilingInfo].set(0, KernelProfilingInfoString, nullptr, true);
     OperandClassParams[OperandCapability].set(0, CapabilityString, nullptr);
-    OperandClassParams[OperandOpcode].set(OpCodeMask + 1, OpcodeString, nullptr);
+    OperandClassParams[OperandOpcode].set(OpCodeMask + 1, OpcodeString, 0);
 
     // set name of operator, an initial set of <id> style operands, and the description
 
diff --git a/third_party/vulkan-deps/glslang/src/SPIRV/doc.h b/third_party/vulkan-deps/glslang/src/SPIRV/doc.h
index 7e15599..2a0b28c 100644
--- a/third_party/vulkan-deps/glslang/src/SPIRV/doc.h
+++ b/third_party/vulkan-deps/glslang/src/SPIRV/doc.h
@@ -190,7 +190,7 @@
 // Parameterize an enumerant
 class EnumParameters {
 public:
-    EnumParameters() : desc(nullptr) { }
+    EnumParameters() : desc(0) { }
     const char* desc;
 };
 
@@ -198,7 +198,7 @@
 class EnumDefinition : public EnumParameters {
 public:
     EnumDefinition() : 
-        ceiling(0), bitmask(false), getName(nullptr), enumParams(nullptr), operandParams(nullptr) { }
+        ceiling(0), bitmask(false), getName(0), enumParams(0), operandParams(0) { }
     void set(int ceil, const char* (*name)(int), EnumParameters* ep, bool mask = false)
     {
         ceiling = ceil;
diff --git a/third_party/vulkan-deps/glslang/src/StandAlone/StandAlone.cpp b/third_party/vulkan-deps/glslang/src/StandAlone/StandAlone.cpp
index e026285..53a6b9c 100644
--- a/third_party/vulkan-deps/glslang/src/StandAlone/StandAlone.cpp
+++ b/third_party/vulkan-deps/glslang/src/StandAlone/StandAlone.cpp
@@ -504,7 +504,7 @@
 
     if (set) {
         errno = 0;
-        int setVal = ::strtol(argv[curArg], nullptr, 10);
+        int setVal = ::strtol(argv[curArg], NULL, 10);
         if (errno || setVal < 0) {
             printf("%s: invalid set\n", argv[curArg]);
             usage();
@@ -516,7 +516,7 @@
 
     if (binding) {
         errno = 0;
-        int bindingVal = ::strtol(argv[curArg], nullptr, 10);
+        int bindingVal = ::strtol(argv[curArg], NULL, 10);
         if (errno || bindingVal < 0) {
             printf("%s: invalid binding\n", argv[curArg]);
             usage();
@@ -594,12 +594,12 @@
     const auto getUniformOverride = [getStringOperand]() {
         const char *arg = getStringOperand("-u<name>:<location>");
         const char *split = strchr(arg, ':');
-        if (split == nullptr) {
+        if (split == NULL) {
             printf("%s: missing location\n", arg);
             exit(EFailUsage);
         }
         errno = 0;
-        int location = ::strtol(split + 1, nullptr, 10);
+        int location = ::strtol(split + 1, NULL, 10);
         if (errno) {
             printf("%s: invalid location\n", arg);
             exit(EFailUsage);
@@ -626,7 +626,7 @@
                     } else if (lowerword == "uniform-base") {
                         if (argc <= 1)
                             Error("no <base> provided", lowerword.c_str());
-                        uniformBase = ::strtol(argv[1], nullptr, 10);
+                        uniformBase = ::strtol(argv[1], NULL, 10);
                         bumpArg();
                         break;
                     } else if (lowerword == "client") {
@@ -1161,7 +1161,7 @@
     } else {
         while (worklist.remove(workItem)) {
             ShHandle compiler = ShConstructCompiler(FindLanguage(workItem->name), Options);
-            if (compiler == nullptr)
+            if (compiler == 0)
                 return;
 
             CompileFile(workItem->name.c_str(), compiler);
@@ -1297,7 +1297,7 @@
             sources.push_back(compUnit.fileNameList[i]);
         }
         glslang::TShader* shader = new glslang::TShader(compUnit.stage);
-        shader->setStringsWithLengthsAndNames(compUnit.text, nullptr, compUnit.fileNameList, compUnit.count);
+        shader->setStringsWithLengthsAndNames(compUnit.text, NULL, compUnit.fileNameList, compUnit.count);
         if (entryPointName)
             shader->setEntryPoint(entryPointName);
         if (sourceEntryPointName) {
diff --git a/third_party/vulkan-deps/glslang/src/StandAlone/spirv-remap.cpp b/third_party/vulkan-deps/glslang/src/StandAlone/spirv-remap.cpp
index 301bb0c..15c3ac5 100644
--- a/third_party/vulkan-deps/glslang/src/StandAlone/spirv-remap.cpp
+++ b/third_party/vulkan-deps/glslang/src/StandAlone/spirv-remap.cpp
@@ -157,7 +157,7 @@
     }
 
     // Print helpful usage message to stdout, and exit
-    void usage(const char* const name, const char* const msg = nullptr)
+    void usage(const char* const name, const char* const msg = 0)
     {
         if (msg)
             std::cout << msg << std::endl << std::endl;
@@ -245,7 +245,7 @@
                 verbosity = 1;
 
                 if (a < argc) {
-                    char* end_ptr = nullptr;
+                    char* end_ptr = 0;
                     int verb = ::strtol(argv[a], &end_ptr, 10);
                     // If we have not read to the end of the string or
                     // the string contained no elements, then we do not want to
diff --git a/third_party/vulkan-deps/glslang/src/gen_extension_headers.py b/third_party/vulkan-deps/glslang/src/gen_extension_headers.py
index 0638720..2838c96 100755
--- a/third_party/vulkan-deps/glslang/src/gen_extension_headers.py
+++ b/third_party/vulkan-deps/glslang/src/gen_extension_headers.py
@@ -57,7 +57,7 @@
         contents += '\tfor (int i = 0; i < n; i++) {\n'
 
         for symbol_name in symbol_name_list:

-            contents += '\t\tif (strstr(shaders[i], "%s") != nullptr) {\n'   % (symbol_name)
+            contents += '\t\tif (strstr(shaders[i], "%s") != NULL) {\n'   % (symbol_name)
             contents += '\t\t    shaderString.append(%s_GLSL);\n' % (symbol_name)
             contents += '\t\t}\n'

 
diff --git a/third_party/vulkan-deps/glslang/src/glslang/GenericCodeGen/Link.cpp b/third_party/vulkan-deps/glslang/src/glslang/GenericCodeGen/Link.cpp
index 5e28405..c38db0f 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/GenericCodeGen/Link.cpp
+++ b/third_party/vulkan-deps/glslang/src/glslang/GenericCodeGen/Link.cpp
@@ -82,7 +82,7 @@
 
 TShHandleBase* ConstructBindings()
 {
-    return nullptr;
+    return 0;
 }
 
 void DeleteBindingList(TShHandleBase* bindingList)
diff --git a/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslGrammar.cpp b/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslGrammar.cpp
index 19a792b..a01f240 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslGrammar.cpp
+++ b/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslGrammar.cpp
@@ -3794,7 +3794,7 @@
         parseContext.unnestLooping();
         --parseContext.controlFlowNestingLevel;
 
-        loopNode = intermediate.addLoop(statement, condition, nullptr, false, loc);
+        loopNode = intermediate.addLoop(statement, condition, 0, false, loc);
         statement = loopNode;
         break;
 
diff --git a/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseHelper.cpp b/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseHelper.cpp
index 6e0d314a..62e46a0 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseHelper.cpp
+++ b/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseHelper.cpp
@@ -1596,7 +1596,7 @@
     //
     bool builtIn;
     TSymbol* symbol = symbolTable.find(function.getMangledName(), &builtIn);
-    const TFunction* prevDec = symbol ? symbol->getAsFunction() : nullptr;
+    const TFunction* prevDec = symbol ? symbol->getAsFunction() : 0;
 
     if (prototype) {
         // All built-in functions are defined, even though they don't have a body.
@@ -2472,7 +2472,7 @@
 void HlslParseContext::handleFunctionArgument(TFunction* function,
                                               TIntermTyped*& arguments, TIntermTyped* newArg)
 {
-    TParameter param = { nullptr, new TType, nullptr };
+    TParameter param = { 0, new TType, nullptr };
     param.type->shallowCopy(newArg->getType());
 
     function->addParameter(param);
@@ -7790,18 +7790,18 @@
             // Handle aggregates: put all args into the new function call
             for (int arg = 0; arg < int(args->getAsAggregate()->getSequence().size()); ++arg) {
                 // TODO: But for constness, we could avoid the new & shallowCopy, and use the pointer directly.
-                TParameter param = { nullptr, new TType, nullptr };
+                TParameter param = { 0, new TType, nullptr };
                 param.type->shallowCopy(args->getAsAggregate()->getSequence()[arg]->getAsTyped()->getType());
                 convertedCall.addParameter(param);
             }
         } else if (args->getAsUnaryNode()) {
             // Handle unaries: put all args into the new function call
-            TParameter param = { nullptr, new TType, nullptr };
+            TParameter param = { 0, new TType, nullptr };
             param.type->shallowCopy(args->getAsUnaryNode()->getOperand()->getAsTyped()->getType());
             convertedCall.addParameter(param);
         } else if (args->getAsTyped()) {
             // Handle bare e.g, floats, not in an aggregate.
-            TParameter param = { nullptr, new TType, nullptr };
+            TParameter param = { 0, new TType, nullptr };
             param.type->shallowCopy(args->getAsTyped()->getType());
             convertedCall.addParameter(param);
         } else {
diff --git a/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseHelper.h b/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseHelper.h
index 97c52d4..96d85f4 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseHelper.h
+++ b/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseHelper.h
@@ -147,14 +147,14 @@
     void declareTypedef(const TSourceLoc&, const TString& identifier, const TType&);
     void declareStruct(const TSourceLoc&, TString& structName, TType&);
     TSymbol* lookupUserType(const TString&, TType&);
-    TIntermNode* declareVariable(const TSourceLoc&, const TString& identifier, TType&, TIntermTyped* initializer = nullptr);
+    TIntermNode* declareVariable(const TSourceLoc&, const TString& identifier, TType&, TIntermTyped* initializer = 0);
     void lengthenList(const TSourceLoc&, TIntermSequence& list, int size, TIntermTyped* scalarInit);
     TIntermTyped* handleConstructor(const TSourceLoc&, TIntermTyped*, const TType&);
     TIntermTyped* addConstructor(const TSourceLoc&, TIntermTyped*, const TType&);
     TIntermTyped* convertArray(TIntermTyped*, const TType&);
     TIntermTyped* constructAggregate(TIntermNode*, const TType&, int, const TSourceLoc&);
     TIntermTyped* constructBuiltIn(const TType&, TOperator, TIntermTyped*, const TSourceLoc&, bool subset);
-    void declareBlock(const TSourceLoc&, TType&, const TString* instanceName = nullptr);
+    void declareBlock(const TSourceLoc&, TType&, const TString* instanceName = 0);
     void declareStructBufferCounter(const TSourceLoc& loc, const TType& bufferType, const TString& name);
     void fixBlockLocations(const TSourceLoc&, TQualifier&, TTypeList&, bool memberWithLocation, bool memberWithoutLocation);
     void fixXfbOffsets(TQualifier&, TTypeList&);
@@ -171,10 +171,10 @@
     void unnestAnnotations() { --annotationNestingLevel; }
     int getAnnotationNestingLevel() { return annotationNestingLevel; }
     void pushScope()         { symbolTable.push(); }
-    void popScope()          { symbolTable.pop(nullptr); }
+    void popScope()          { symbolTable.pop(0); }
 
     void pushThisScope(const TType&, const TVector<TFunctionDeclarator>&);
-    void popThisScope()      { symbolTable.pop(nullptr); }
+    void popThisScope()      { symbolTable.pop(0); }
 
     void pushImplicitThis(TVariable* thisParameter) { implicitThisStack.push_back(thisParameter); }
     void popImplicitThis() { implicitThisStack.pop_back(); }
diff --git a/third_party/vulkan-deps/glslang/src/glslang/Include/PoolAlloc.h b/third_party/vulkan-deps/glslang/src/glslang/Include/PoolAlloc.h
index 3e67d6e..1f5cac7 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/Include/PoolAlloc.h
+++ b/third_party/vulkan-deps/glslang/src/glslang/Include/PoolAlloc.h
@@ -37,7 +37,7 @@
 #ifndef _POOLALLOC_INCLUDED_
 #define _POOLALLOC_INCLUDED_
 
-#ifndef NDEBUG
+#ifdef _DEBUG
 #  define GUARD_BLOCKS  // define to enable guard block sanity checking
 #endif
 
@@ -74,7 +74,7 @@
 
 class TAllocation {
 public:
-    TAllocation(size_t size, unsigned char* mem, TAllocation* prev = nullptr) :
+    TAllocation(size_t size, unsigned char* mem, TAllocation* prev = 0) :
         size(size), mem(mem), prevAlloc(prev) {
         // Allocations are bracketed:
         //    [allocationHeader][initialGuardBlock][userData][finalGuardBlock]
@@ -171,7 +171,7 @@
     void popAll();
 
     //
-    // Call allocate() to actually acquire memory.  Returns nullptr if no memory
+    // Call allocate() to actually acquire memory.  Returns 0 if no memory
     // available, otherwise a properly aligned pointer to 'numBytes' of memory.
     //
     void* allocate(size_t numBytes);
@@ -189,7 +189,7 @@
     struct tHeader {
         tHeader(tHeader* nextPage, size_t pageCount) :
 #ifdef GUARD_BLOCKS
-        lastAllocation(nullptr),
+        lastAllocation(0),
 #endif
         nextPage(nextPage), pageCount(pageCount) { }
 
diff --git a/third_party/vulkan-deps/glslang/src/glslang/Include/ShHandle.h b/third_party/vulkan-deps/glslang/src/glslang/Include/ShHandle.h
index dee47c0..df07bd8 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/Include/ShHandle.h
+++ b/third_party/vulkan-deps/glslang/src/glslang/Include/ShHandle.h
@@ -58,9 +58,9 @@
 public:
     TShHandleBase() { pool = new glslang::TPoolAllocator; }
     virtual ~TShHandleBase() { delete pool; }
-    virtual TCompiler* getAsCompiler() { return nullptr; }
-    virtual TLinker* getAsLinker() { return nullptr; }
-    virtual TUniformMap* getAsUniformMap() { return nullptr; }
+    virtual TCompiler* getAsCompiler() { return 0; }
+    virtual TLinker* getAsLinker() { return 0; }
+    virtual TUniformMap* getAsUniformMap() { return 0; }
     virtual glslang::TPoolAllocator* getPool() const { return pool; }
 private:
     glslang::TPoolAllocator* pool;
@@ -123,11 +123,11 @@
         infoSink(iSink),
         executable(e),
         haveReturnableObjectCode(false),
-        appAttributeBindings(nullptr),
-        fixedAttributeBindings(nullptr),
-        excludedAttributes(nullptr),
+        appAttributeBindings(0),
+        fixedAttributeBindings(0),
+        excludedAttributes(0),
         excludedCount(0),
-        uniformBindings(nullptr) { }
+        uniformBindings(0) { }
     virtual TLinker* getAsLinker() { return this; }
     virtual ~TLinker() { }
     virtual bool link(TCompilerList&, TUniformMap*) = 0;
@@ -137,7 +137,7 @@
     virtual void getAttributeBindings(ShBindingTable const **t) const = 0;
     virtual void setExcludedAttributes(const int* attributes, int count) { excludedAttributes = attributes; excludedCount = count; }
     virtual ShBindingTable* getUniformBindings() const  { return uniformBindings; }
-    virtual const void* getObjectCode() const { return nullptr; } // a real compiler would be returning object code here
+    virtual const void* getObjectCode() const { return 0; } // a real compiler would be returning object code here
     virtual TInfoSink& getInfoSink() { return infoSink; }
     TInfoSink& infoSink;
 protected:
diff --git a/third_party/vulkan-deps/glslang/src/glslang/Include/intermediate.h b/third_party/vulkan-deps/glslang/src/glslang/Include/intermediate.h
index 2b81a22..a024002 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/Include/intermediate.h
+++ b/third_party/vulkan-deps/glslang/src/glslang/Include/intermediate.h
@@ -1086,31 +1086,31 @@
     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::TIntermTyped*         getAsTyped()               { return nullptr; }
-    virtual       glslang::TIntermOperator*      getAsOperator()            { return nullptr; }
-    virtual       glslang::TIntermConstantUnion* getAsConstantUnion()       { return nullptr; }
-    virtual       glslang::TIntermAggregate*     getAsAggregate()           { return nullptr; }
-    virtual       glslang::TIntermUnary*         getAsUnaryNode()           { return nullptr; }
-    virtual       glslang::TIntermBinary*        getAsBinaryNode()          { return nullptr; }
-    virtual       glslang::TIntermSelection*     getAsSelectionNode()       { return nullptr; }
-    virtual       glslang::TIntermSwitch*        getAsSwitchNode()          { return nullptr; }
-    virtual       glslang::TIntermMethod*        getAsMethodNode()          { return nullptr; }
-    virtual       glslang::TIntermSymbol*        getAsSymbolNode()          { return nullptr; }
-    virtual       glslang::TIntermBranch*        getAsBranchNode()          { return nullptr; }
-    virtual       glslang::TIntermLoop*          getAsLoopNode()            { return nullptr; }
+    virtual       glslang::TIntermTyped*         getAsTyped()               { return 0; }
+    virtual       glslang::TIntermOperator*      getAsOperator()            { return 0; }
+    virtual       glslang::TIntermConstantUnion* getAsConstantUnion()       { return 0; }
+    virtual       glslang::TIntermAggregate*     getAsAggregate()           { return 0; }
+    virtual       glslang::TIntermUnary*         getAsUnaryNode()           { return 0; }
+    virtual       glslang::TIntermBinary*        getAsBinaryNode()          { return 0; }
+    virtual       glslang::TIntermSelection*     getAsSelectionNode()       { return 0; }
+    virtual       glslang::TIntermSwitch*        getAsSwitchNode()          { return 0; }
+    virtual       glslang::TIntermMethod*        getAsMethodNode()          { return 0; }
+    virtual       glslang::TIntermSymbol*        getAsSymbolNode()          { return 0; }
+    virtual       glslang::TIntermBranch*        getAsBranchNode()          { return 0; }
+    virtual       glslang::TIntermLoop*          getAsLoopNode()            { return 0; }
 
-    virtual const glslang::TIntermTyped*         getAsTyped()         const { return nullptr; }
-    virtual const glslang::TIntermOperator*      getAsOperator()      const { return nullptr; }
-    virtual const glslang::TIntermConstantUnion* getAsConstantUnion() const { return nullptr; }
-    virtual const glslang::TIntermAggregate*     getAsAggregate()     const { return nullptr; }
-    virtual const glslang::TIntermUnary*         getAsUnaryNode()     const { return nullptr; }
-    virtual const glslang::TIntermBinary*        getAsBinaryNode()    const { return nullptr; }
-    virtual const glslang::TIntermSelection*     getAsSelectionNode() const { return nullptr; }
-    virtual const glslang::TIntermSwitch*        getAsSwitchNode()    const { return nullptr; }
-    virtual const glslang::TIntermMethod*        getAsMethodNode()    const { return nullptr; }
-    virtual const glslang::TIntermSymbol*        getAsSymbolNode()    const { return nullptr; }
-    virtual const glslang::TIntermBranch*        getAsBranchNode()    const { return nullptr; }
-    virtual const glslang::TIntermLoop*          getAsLoopNode()      const { return nullptr; }
+    virtual const glslang::TIntermTyped*         getAsTyped()         const { return 0; }
+    virtual const glslang::TIntermOperator*      getAsOperator()      const { return 0; }
+    virtual const glslang::TIntermConstantUnion* getAsConstantUnion() const { return 0; }
+    virtual const glslang::TIntermAggregate*     getAsAggregate()     const { return 0; }
+    virtual const glslang::TIntermUnary*         getAsUnaryNode()     const { return 0; }
+    virtual const glslang::TIntermBinary*        getAsBinaryNode()    const { return 0; }
+    virtual const glslang::TIntermSelection*     getAsSelectionNode() const { return 0; }
+    virtual const glslang::TIntermSwitch*        getAsSwitchNode()    const { return 0; }
+    virtual const glslang::TIntermMethod*        getAsMethodNode()    const { return 0; }
+    virtual const glslang::TIntermSymbol*        getAsSymbolNode()    const { return 0; }
+    virtual const glslang::TIntermBranch*        getAsBranchNode()    const { return 0; }
+    virtual const glslang::TIntermLoop*          getAsLoopNode()      const { return 0; }
     virtual ~TIntermNode() { }
 
 protected:
@@ -1616,8 +1616,8 @@
 //
 class TIntermUnary : public TIntermOperator {
 public:
-    TIntermUnary(TOperator o, TType& t) : TIntermOperator(o, t), operand(nullptr) {}
-    TIntermUnary(TOperator o) : TIntermOperator(o), operand(nullptr) {}
+    TIntermUnary(TOperator o, TType& t) : TIntermOperator(o, t), operand(0) {}
+    TIntermUnary(TOperator o) : TIntermOperator(o), operand(0) {}
     virtual void traverse(TIntermTraverser*);
     virtual void setOperand(TIntermTyped* o) { operand = o; }
     virtual       TIntermTyped* getOperand() { return operand; }
@@ -1819,7 +1819,7 @@
 
     TIntermNode *getParentNode()
     {
-        return path.size() == 0 ? nullptr : path.back();
+        return path.size() == 0 ? NULL : path.back();
     }
 
     const bool preVisit;
diff --git a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Constant.cpp b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Constant.cpp
index 40f53bb..5fc61db 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Constant.cpp
+++ b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Constant.cpp
@@ -226,7 +226,7 @@
                     newConstArray[i].setU64Const(leftUnionArray[i].getU64Const() / rightUnionArray[i].getU64Const());
                 break;
             default:
-                return nullptr;
+                return 0;
 #endif
             }
         }
@@ -354,7 +354,7 @@
         break;
 
     default:
-        return nullptr;
+        return 0;
     }
 
     TIntermConstantUnion *newNode = new TIntermConstantUnion(newConstArray, returnType);
@@ -1345,7 +1345,7 @@
 {
     TType dereferencedType(node->getType(), index);
     dereferencedType.getQualifier().storage = EvqConst;
-    TIntermTyped* result = nullptr;
+    TIntermTyped* result = 0;
     int size = dereferencedType.computeNumComponents();
 
     // arrays, vectors, matrices, all use simple multiplicative math
@@ -1365,7 +1365,7 @@
 
     result = addConstantUnion(TConstUnionArray(node->getAsConstantUnion()->getConstArray(), start, size), node->getType(), loc);
 
-    if (result == nullptr)
+    if (result == 0)
         result = node;
     else
         result->setType(dereferencedType);
@@ -1387,7 +1387,7 @@
 
     TIntermTyped* result = addConstantUnion(constArray, node->getType(), loc);
 
-    if (result == nullptr)
+    if (result == 0)
         result = node;
     else
         result->setType(TType(node->getBasicType(), EvqConst, selectors.size()));
diff --git a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Intermediate.cpp b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Intermediate.cpp
index 5adf19d..6a43ef3 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Intermediate.cpp
+++ b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Intermediate.cpp
@@ -352,7 +352,7 @@
 TIntermTyped* TIntermediate::addUnaryMath(TOperator op, TIntermTyped* child,
     const TSourceLoc& loc)
 {
-    if (child == nullptr)
+    if (child == 0)
         return nullptr;
 
     if (child->getType().getBasicType() == EbtBlock)
diff --git a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/ParseHelper.cpp b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/ParseHelper.cpp
index ff76cad..41afbc0 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/ParseHelper.cpp
+++ b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/ParseHelper.cpp
@@ -1165,7 +1165,7 @@
     if (symbol && builtIn && function.getBuiltInOp() == EOpSpirvInst)
         symbol = nullptr;
 #endif
-    const TFunction* prevDec = symbol ? symbol->getAsFunction() : nullptr;
+    const TFunction* prevDec = symbol ? symbol->getAsFunction() : 0;
     if (prevDec) {
         if (prevDec->isPrototyped() && prototype)
             profileRequires(loc, EEsProfile, 300, nullptr, "multiple prototypes for same function");
@@ -3140,7 +3140,7 @@
             ppWarn(loc, "\"defined\" is (un)defined:", op,  identifier);
         else
             ppError(loc, "\"defined\" can't be (un)defined:", op,  identifier);
-    else if (strstr(identifier, "__") != nullptr && !extensionTurnedOn(E_GL_EXT_spirv_intrinsics)) {
+    else if (strstr(identifier, "__") != 0 && !extensionTurnedOn(E_GL_EXT_spirv_intrinsics)) {
         // The extension GL_EXT_spirv_intrinsics allows us to declare macros prefixed with "__".
         if (isEsProfile() && version >= 300 &&
             (strcmp(identifier, "__LINE__") == 0 ||
@@ -5206,7 +5206,7 @@
     bool badInit = false;
     if (! init || ! init->getAsAggregate() || init->getAsAggregate()->getSequence().size() != 1)
         badInit = true;
-    TIntermBinary* binaryInit = nullptr;
+    TIntermBinary* binaryInit = 0;
     if (! badInit) {
         // get the declaration assignment
         binaryInit = init->getAsAggregate()->getSequence()[0]->getAsBinaryNode();
@@ -6015,7 +6015,7 @@
             if (language == EShLangMesh || language == EShLangTask) {
                 requireExtensions(loc, Num_AEP_mesh_shader, AEP_mesh_shader, "gl_WorkGroupSize");
             } else {
-                profileRequires(loc, EEsProfile, 310, nullptr, "gl_WorkGroupSize");
+                profileRequires(loc, EEsProfile, 310, 0, "gl_WorkGroupSize");
                 profileRequires(loc, ~EEsProfile, 430, E_GL_ARB_compute_shader, "gl_WorkGroupSize");
             }
 #endif
@@ -7082,7 +7082,7 @@
             realFunc.addParameter(TParameter().copyParam((*function)[i]));
         }
 
-        TParameter tmpP = { nullptr, &uintType };
+        TParameter tmpP = { 0, &uintType };
         realFunc.addParameter(TParameter().copyParam(tmpP));
         arguments = intermediate.growAggregate(arguments, intermediate.addConstantUnion(1, loc, true));
 
@@ -7099,7 +7099,7 @@
             realFunc.addParameter(TParameter().copyParam((*function)[i]));
         }
 
-        TParameter tmpP = { nullptr, &uintType };
+        TParameter tmpP = { 0, &uintType };
         realFunc.addParameter(TParameter().copyParam(tmpP));
         arguments = intermediate.growAggregate(arguments, intermediate.addConstantUnion(-1, loc, true));
 
diff --git a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/ParseHelper.h b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/ParseHelper.h
index 64dc005..885fd90 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/ParseHelper.h
+++ b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/ParseHelper.h
@@ -438,12 +438,12 @@
     const TFunction* findFunction400(const TSourceLoc& loc, const TFunction& call, bool& builtIn);
     const TFunction* findFunctionExplicitTypes(const TSourceLoc& loc, const TFunction& call, bool& builtIn);
     void declareTypeDefaults(const TSourceLoc&, const TPublicType&);
-    TIntermNode* declareVariable(const TSourceLoc&, TString& identifier, const TPublicType&, TArraySizes* typeArray = nullptr, TIntermTyped* initializer = nullptr);
+    TIntermNode* declareVariable(const TSourceLoc&, TString& identifier, const TPublicType&, TArraySizes* typeArray = 0, TIntermTyped* initializer = 0);
     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 inheritMemoryQualifiers(const TQualifier& from, TQualifier& to);
-    void declareBlock(const TSourceLoc&, TTypeList& typeList, const TString* instanceName = nullptr, TArraySizes* arraySizes = nullptr);
+    void declareBlock(const TSourceLoc&, TTypeList& typeList, const TString* instanceName = 0, TArraySizes* arraySizes = 0);
     void blockStorageRemap(const TSourceLoc&, const TString*, TQualifier&);
     void blockStageIoCheck(const TSourceLoc&, const TQualifier&);
     void blockQualifierCheck(const TSourceLoc&, const TQualifier&, bool instanceName);
diff --git a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/PoolAlloc.cpp b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/PoolAlloc.cpp
index c3a3928..84c40f4 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/PoolAlloc.cpp
+++ b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/PoolAlloc.cpp
@@ -267,8 +267,8 @@
         //
         size_t numBytesToAlloc = allocationSize + headerSkip;
         tHeader* memory = reinterpret_cast<tHeader*>(::new char[numBytesToAlloc]);
-        if (memory == nullptr)
-            return nullptr;
+        if (memory == 0)
+            return 0;
 
         // Use placement-new to initialize header
         new(memory) tHeader(inUseList, (numBytesToAlloc + pageSize - 1) / pageSize);
@@ -289,8 +289,8 @@
         freeList = freeList->nextPage;
     } else {
         memory = reinterpret_cast<tHeader*>(::new char[pageSize]);
-        if (memory == nullptr)
-            return nullptr;
+        if (memory == 0)
+            return 0;
     }
 
     // Use placement-new to initialize header
@@ -308,7 +308,7 @@
 //
 void TAllocation::checkAllocList() const
 {
-    for (const TAllocation* alloc = this; alloc != nullptr; alloc = alloc->prevAlloc)
+    for (const TAllocation* alloc = this; alloc != 0; alloc = alloc->prevAlloc)
         alloc->check();
 }
 
diff --git a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/ShaderLang.cpp b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/ShaderLang.cpp
index ed40c36..ced0086 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/ShaderLang.cpp
+++ b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/ShaderLang.cpp
@@ -1357,7 +1357,7 @@
 ShHandle ShConstructCompiler(const EShLanguage language, int debugOptions)
 {
     if (!InitThread())
-        return nullptr;
+        return 0;
 
     TShHandleBase* base = static_cast<TShHandleBase*>(ConstructCompiler(language, debugOptions));
 
@@ -1367,7 +1367,7 @@
 ShHandle ShConstructLinker(const EShExecutable executable, int debugOptions)
 {
     if (!InitThread())
-        return nullptr;
+        return 0;
 
     TShHandleBase* base = static_cast<TShHandleBase*>(ConstructLinker(executable, debugOptions));
 
@@ -1377,7 +1377,7 @@
 ShHandle ShConstructUniformMap()
 {
     if (!InitThread())
-        return nullptr;
+        return 0;
 
     TShHandleBase* base = static_cast<TShHandleBase*>(ConstructUniformMap());
 
@@ -1386,7 +1386,7 @@
 
 void ShDestruct(ShHandle handle)
 {
-    if (handle == nullptr)
+    if (handle == 0)
         return;
 
     TShHandleBase* base = static_cast<TShHandleBase*>(handle);
@@ -1419,7 +1419,7 @@
                 for (int source = 0; source < SourceCount; ++source) {
                     for (int stage = 0; stage < EShLangCount; ++stage) {
                         delete SharedSymbolTables[version][spvVersion][p][source][stage];
-                        SharedSymbolTables[version][spvVersion][p][source][stage] = nullptr;
+                        SharedSymbolTables[version][spvVersion][p][source][stage] = 0;
                     }
                 }
             }
@@ -1432,7 +1432,7 @@
                 for (int source = 0; source < SourceCount; ++source) {
                     for (int pc = 0; pc < EPcCount; ++pc) {
                         delete CommonSymbolTable[version][spvVersion][p][source][pc];
-                        CommonSymbolTable[version][spvVersion][p][source][pc] = nullptr;
+                        CommonSymbolTable[version][spvVersion][p][source][pc] = 0;
                     }
                 }
             }
@@ -1475,12 +1475,12 @@
     )
 {
     // Map the generic handle to the C++ object
-    if (handle == nullptr)
+    if (handle == 0)
         return 0;
 
     TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle);
     TCompiler* compiler = base->getAsCompiler();
-    if (compiler == nullptr)
+    if (compiler == 0)
         return 0;
 
     SetThreadPoolAllocator(compiler->getPool());
@@ -1520,13 +1520,13 @@
     const ShHandle compHandles[],
     const int numHandles)
 {
-    if (linkHandle == nullptr || numHandles == 0)
+    if (linkHandle == 0 || numHandles == 0)
         return 0;
 
     THandleList cObjects;
 
     for (int i = 0; i < numHandles; ++i) {
-        if (compHandles[i] == nullptr)
+        if (compHandles[i] == 0)
             return 0;
         TShHandleBase* base = reinterpret_cast<TShHandleBase*>(compHandles[i]);
         if (base->getAsLinker()) {
@@ -1535,7 +1535,7 @@
         if (base->getAsCompiler())
             cObjects.push_back(base->getAsCompiler());
 
-        if (cObjects[i] == nullptr)
+        if (cObjects[i] == 0)
             return 0;
     }
 
@@ -1544,7 +1544,7 @@
 
     SetThreadPoolAllocator(linker->getPool());
 
-    if (linker == nullptr)
+    if (linker == 0)
         return 0;
 
     linker->infoSink.info.erase();
@@ -1569,7 +1569,7 @@
 //
 void ShSetEncryptionMethod(ShHandle handle)
 {
-    if (handle == nullptr)
+    if (handle == 0)
         return;
 }
 
@@ -1578,8 +1578,8 @@
 //
 const char* ShGetInfoLog(const ShHandle handle)
 {
-    if (handle == nullptr)
-        return nullptr;
+    if (handle == 0)
+        return 0;
 
     TShHandleBase* base = static_cast<TShHandleBase*>(handle);
     TInfoSink* infoSink;
@@ -1589,7 +1589,7 @@
     else if (base->getAsLinker())
         infoSink = &(base->getAsLinker()->getInfoSink());
     else
-        return nullptr;
+        return 0;
 
     infoSink->info << infoSink->debug.c_str();
     return infoSink->info.c_str();
@@ -1601,14 +1601,14 @@
 //
 const void* ShGetExecutable(const ShHandle handle)
 {
-    if (handle == nullptr)
-        return nullptr;
+    if (handle == 0)
+        return 0;
 
     TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle);
 
     TLinker* linker = static_cast<TLinker*>(base->getAsLinker());
-    if (linker == nullptr)
-        return nullptr;
+    if (linker == 0)
+        return 0;
 
     return linker->getObjectCode();
 }
@@ -1623,13 +1623,13 @@
 //
 int ShSetVirtualAttributeBindings(const ShHandle handle, const ShBindingTable* table)
 {
-    if (handle == nullptr)
+    if (handle == 0)
         return 0;
 
     TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle);
     TLinker* linker = static_cast<TLinker*>(base->getAsLinker());
 
-    if (linker == nullptr)
+    if (linker == 0)
         return 0;
 
     linker->setAppAttributeBindings(table);
@@ -1642,13 +1642,13 @@
 //
 int ShSetFixedAttributeBindings(const ShHandle handle, const ShBindingTable* table)
 {
-    if (handle == nullptr)
+    if (handle == 0)
         return 0;
 
     TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle);
     TLinker* linker = static_cast<TLinker*>(base->getAsLinker());
 
-    if (linker == nullptr)
+    if (linker == 0)
         return 0;
 
     linker->setFixedAttributeBindings(table);
@@ -1660,12 +1660,12 @@
 //
 int ShExcludeAttributes(const ShHandle handle, int *attributes, int count)
 {
-    if (handle == nullptr)
+    if (handle == 0)
         return 0;
 
     TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle);
     TLinker* linker = static_cast<TLinker*>(base->getAsLinker());
-    if (linker == nullptr)
+    if (linker == 0)
         return 0;
 
     linker->setExcludedAttributes(attributes, count);
@@ -1681,12 +1681,12 @@
 //
 int ShGetUniformLocation(const ShHandle handle, const char* name)
 {
-    if (handle == nullptr)
+    if (handle == 0)
         return -1;
 
     TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle);
     TUniformMap* uniformMap= base->getAsUniformMap();
-    if (uniformMap == nullptr)
+    if (uniformMap == 0)
         return -1;
 
     return uniformMap->getLocation(name);
@@ -1954,14 +1954,14 @@
 
 TProgram::TProgram() :
 #if !defined(GLSLANG_WEB)
-    reflection(nullptr),
+    reflection(0),
 #endif
     linked(false)
 {
     pool = new TPoolAllocator;
     infoSink = new TInfoSink;
     for (int s = 0; s < EShLangCount; ++s) {
-        intermediate[s] = nullptr;
+        intermediate[s] = 0;
         newedIntermediate[s] = false;
     }
 }
diff --git a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/SymbolTable.cpp b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/SymbolTable.cpp
index 57b868a..b140686 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/SymbolTable.cpp
+++ b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/SymbolTable.cpp
@@ -416,7 +416,7 @@
     // copy of the original container.
     assert(0);
 
-    return nullptr;
+    return 0;
 }
 
 TSymbolTableLevel* TSymbolTableLevel::clone() const
diff --git a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/SymbolTable.h b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/SymbolTable.h
index bf427c5..0d45e48 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/SymbolTable.h
+++ b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/SymbolTable.h
@@ -84,7 +84,7 @@
 class TSymbol {
 public:
     POOL_ALLOCATOR_NEW_DELETE(GetThreadPoolAllocator())
-    explicit TSymbol(const TString *n) :  name(n), uniqueId(0), extensions(nullptr), writable(true) { }
+    explicit TSymbol(const TString *n) :  name(n), uniqueId(0), extensions(0), writable(true) { }
     virtual TSymbol* clone() const = 0;
     virtual ~TSymbol() { }  // rely on all symbol owned memory coming from the pool
 
@@ -97,18 +97,18 @@
         changeName(NewPoolTString(newName.c_str()));
     }
     virtual const TString& getMangledName() const { return getName(); }
-    virtual TFunction* getAsFunction() { return nullptr; }
-    virtual const TFunction* getAsFunction() const { return nullptr; }
-    virtual TVariable* getAsVariable() { return nullptr; }
-    virtual const TVariable* getAsVariable() const { return nullptr; }
-    virtual const TAnonMember* getAsAnonMember() const { return nullptr; }
+    virtual TFunction* getAsFunction() { return 0; }
+    virtual const TFunction* getAsFunction() const { return 0; }
+    virtual TVariable* getAsVariable() { return 0; }
+    virtual const TVariable* getAsVariable() const { return 0; }
+    virtual const TAnonMember* getAsAnonMember() const { return 0; }
     virtual const TType& getType() const = 0;
     virtual TType& getWritableType() = 0;
     virtual void setUniqueId(long long id) { uniqueId = id; }
     virtual long long getUniqueId() const { return uniqueId; }
     virtual void setExtensions(int numExts, const char* const exts[])
     {
-        assert(extensions == nullptr);
+        assert(extensions == 0);
         assert(numExts > 0);
         extensions = NewPoolObject(extensions);
         for (int e = 0; e < numExts; ++e)
@@ -229,7 +229,7 @@
         if (param.name)
             name = NewPoolTString(param.name->c_str());
         else
-            name = nullptr;
+            name = 0;
         type = param.type->clone();
         defaultValue = param.defaultValue;
         return *this;
@@ -243,7 +243,7 @@
 class TFunction : public TSymbol {
 public:
     explicit TFunction(TOperator o) :
-        TSymbol(nullptr),
+        TSymbol(0),
         op(o),
         defined(false), prototyped(false), implicitThis(false), illegalImplicitThis(false), defaultParamCount(0) { }
     TFunction(const TString *name, const TType& retType, TOperator tOp = EOpNull) :
@@ -411,7 +411,7 @@
 class TSymbolTableLevel {
 public:
     POOL_ALLOCATOR_NEW_DELETE(GetThreadPoolAllocator())
-    TSymbolTableLevel() : defaultPrecision(nullptr), anonId(0), thisLevel(false) { }
+    TSymbolTableLevel() : defaultPrecision(0), anonId(0), thisLevel(false) { }
     ~TSymbolTableLevel();
 
     bool insert(const TString& name, TSymbol* symbol) {
@@ -493,7 +493,7 @@
     {
         tLevel::const_iterator it = level.find(name);
         if (it == level.end())
-            return nullptr;
+            return 0;
         else
             return (*it).second;
     }
@@ -561,7 +561,7 @@
     {
         // can call multiple times at one scope, will only latch on first call,
         // as we're tracking the previous scope's values, not the current values
-        if (defaultPrecision != nullptr)
+        if (defaultPrecision != 0)
             return;
 
         defaultPrecision = new TPrecisionQualifier[EbtNumTypes];
@@ -573,7 +573,7 @@
     {
         // can be called for table level pops that didn't set the
         // defaults
-        if (defaultPrecision == nullptr || p == nullptr)
+        if (defaultPrecision == 0 || p == 0)
             return;
 
         for (int t = 0; t < EbtNumTypes; ++t)
@@ -622,7 +622,7 @@
 
         // don't deallocate levels passed in from elsewhere
         while (table.size() > adoptedLevels)
-            pop(nullptr);
+            pop(0);
     }
 
     void adoptLevels(TSymbolTable& symTable)
@@ -783,7 +783,7 @@
 
     // Normal find of a symbol, that can optionally say whether the symbol was found
     // at a built-in level or the current top-scope level.
-    TSymbol* find(const TString& name, bool* builtIn = nullptr, bool* currentScope = nullptr, int* thisDepthP = nullptr)
+    TSymbol* find(const TString& name, bool* builtIn = 0, bool* currentScope = 0, int* thisDepthP = 0)
     {
         int level = currentLevel();
         TSymbol* symbol;
@@ -827,7 +827,7 @@
                 ++thisDepth;
             symbol = table[level]->find(name);
             --level;
-        } while (symbol == nullptr && level >= 0);
+        } while (symbol == 0 && level >= 0);
 
         if (! table[level + 1]->isThisLevel())
             thisDepth = 0;
diff --git a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Versions.cpp b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Versions.cpp
index 1541802..a5fd107 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Versions.cpp
+++ b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Versions.cpp
@@ -1066,8 +1066,8 @@
     if (strcmp(extension, "GL_NV_mesh_shader") == 0) {
         requireStage(loc, (EShLanguageMask)(EShLangTaskMask | EShLangMeshMask | EShLangFragmentMask),
                      "#extension GL_NV_mesh_shader");
-        profileRequires(loc, ECoreProfile, 450, nullptr, "#extension GL_NV_mesh_shader");
-        profileRequires(loc, EEsProfile, 320, nullptr, "#extension GL_NV_mesh_shader");
+        profileRequires(loc, ECoreProfile, 450, 0, "#extension GL_NV_mesh_shader");
+        profileRequires(loc, EEsProfile, 320, 0, "#extension GL_NV_mesh_shader");
         if (extensionTurnedOn(E_GL_EXT_mesh_shader)) {
             error(loc, "GL_EXT_mesh_shader is already turned on, and not allowed with", "#extension", extension);
         }
@@ -1075,8 +1075,8 @@
     else if (strcmp(extension, "GL_EXT_mesh_shader") == 0) {
         requireStage(loc, (EShLanguageMask)(EShLangTaskMask | EShLangMeshMask | EShLangFragmentMask),
                      "#extension GL_EXT_mesh_shader");
-        profileRequires(loc, ECoreProfile, 450, nullptr, "#extension GL_EXT_mesh_shader");
-        profileRequires(loc, EEsProfile, 320, nullptr, "#extension GL_EXT_mesh_shader");
+        profileRequires(loc, ECoreProfile, 450, 0, "#extension GL_EXT_mesh_shader");
+        profileRequires(loc, EEsProfile, 320, 0, "#extension GL_EXT_mesh_shader");
         if (extensionTurnedOn(E_GL_NV_mesh_shader)) {
             error(loc, "GL_NV_mesh_shader is already turned on, and not allowed with", "#extension", extension);
         }
diff --git a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/glslang_tab.cpp b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/glslang_tab.cpp
index 7a5ac52..7ca3e71 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/glslang_tab.cpp
+++ b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/glslang_tab.cpp
@@ -5446,7 +5446,7 @@
   case 31: /* function_call_header_with_parameters: function_call_header assignment_expression  */
 #line 526 "MachineIndependent/glslang.y"
                                                  {
-        TParameter param = { nullptr, new TType };
+        TParameter param = { 0, new TType };
         param.type->shallowCopy((yyvsp[0].interm.intermTypedNode)->getType());
         (yyvsp[-1].interm).function->addParameter(param);
         (yyval.interm).function = (yyvsp[-1].interm).function;
@@ -5458,7 +5458,7 @@
   case 32: /* function_call_header_with_parameters: function_call_header_with_parameters COMMA assignment_expression  */
 #line 533 "MachineIndependent/glslang.y"
                                                                        {
-        TParameter param = { nullptr, new TType };
+        TParameter param = { 0, new TType };
         param.type->shallowCopy((yyvsp[0].interm.intermTypedNode)->getType());
         (yyvsp[-2].interm).function->addParameter(param);
         (yyval.interm).function = (yyvsp[-2].interm).function;
@@ -5479,7 +5479,7 @@
 #line 551 "MachineIndependent/glslang.y"
                      {
         // Constructor
-        (yyval.interm).intermNode = nullptr;
+        (yyval.interm).intermNode = 0;
         (yyval.interm).function = parseContext.handleConstructorCall((yyvsp[0].interm.type).loc, (yyvsp[0].interm.type));
     }
 #line 5486 "MachineIndependent/glslang_tab.cpp"
@@ -5491,8 +5491,8 @@
         //
         // Should be a method or subroutine call, but we haven't recognized the arguments yet.
         //
-        (yyval.interm).function = nullptr;
-        (yyval.interm).intermNode = nullptr;
+        (yyval.interm).function = 0;
+        (yyval.interm).intermNode = 0;
 
         TIntermMethod* method = (yyvsp[0].interm.intermTypedNode)->getAsMethodNode();
         if (method) {
@@ -5508,7 +5508,7 @@
                 parseContext.error((yyvsp[0].interm.intermTypedNode)->getLoc(), "function call, method, or subroutine call expected", "", "");
         }
 
-        if ((yyval.interm).function == nullptr) {
+        if ((yyval.interm).function == 0) {
             // error recover
             TString* empty = NewPoolTString("");
             (yyval.interm).function = new TFunction(empty, TType(EbtVoid), EOpNull);
@@ -5521,7 +5521,7 @@
 #line 584 "MachineIndependent/glslang.y"
                             {
         // Constructor
-        (yyval.interm).intermNode = nullptr;
+        (yyval.interm).intermNode = 0;
         (yyval.interm).function = parseContext.handleConstructorCall((yyvsp[0].interm.type).loc, (yyvsp[0].interm.type));
     }
 #line 5528 "MachineIndependent/glslang_tab.cpp"
@@ -5612,7 +5612,7 @@
 #line 637 "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) == nullptr)
+        if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
     }
 #line 5619 "MachineIndependent/glslang_tab.cpp"
@@ -5622,7 +5622,7 @@
 #line 642 "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) == nullptr)
+        if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
     }
 #line 5629 "MachineIndependent/glslang_tab.cpp"
@@ -5633,7 +5633,7 @@
                                                          {
         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) == nullptr)
+        if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
     }
 #line 5640 "MachineIndependent/glslang_tab.cpp"
@@ -5649,7 +5649,7 @@
 #line 657 "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) == nullptr)
+        if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
     }
 #line 5656 "MachineIndependent/glslang_tab.cpp"
@@ -5659,7 +5659,7 @@
 #line 662 "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) == nullptr)
+        if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
     }
 #line 5666 "MachineIndependent/glslang_tab.cpp"
@@ -5676,7 +5676,7 @@
                                                    {
         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) == nullptr)
+        if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
     }
 #line 5683 "MachineIndependent/glslang_tab.cpp"
@@ -5687,7 +5687,7 @@
                                                     {
         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) == nullptr)
+        if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
     }
 #line 5694 "MachineIndependent/glslang_tab.cpp"
@@ -5703,7 +5703,7 @@
 #line 687 "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) == nullptr)
+        if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
     }
 #line 5710 "MachineIndependent/glslang_tab.cpp"
@@ -5713,7 +5713,7 @@
 #line 692 "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) == nullptr)
+        if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
     }
 #line 5720 "MachineIndependent/glslang_tab.cpp"
@@ -5723,7 +5723,7 @@
 #line 697 "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) == nullptr)
+        if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
     }
 #line 5730 "MachineIndependent/glslang_tab.cpp"
@@ -5733,7 +5733,7 @@
 #line 702 "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) == nullptr)
+        if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
     }
 #line 5740 "MachineIndependent/glslang_tab.cpp"
@@ -5753,7 +5753,7 @@
         parseContext.specializationCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "==");
         parseContext.referenceCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "==");
         (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "==", EOpEqual, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
-        if ((yyval.interm.intermTypedNode) == nullptr)
+        if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
     }
 #line 5760 "MachineIndependent/glslang_tab.cpp"
@@ -5767,7 +5767,7 @@
         parseContext.specializationCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "!=");
         parseContext.referenceCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "!=");
         (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "!=", EOpNotEqual, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
-        if ((yyval.interm.intermTypedNode) == nullptr)
+        if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
     }
 #line 5774 "MachineIndependent/glslang_tab.cpp"
@@ -5784,7 +5784,7 @@
                                                    {
         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) == nullptr)
+        if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
     }
 #line 5791 "MachineIndependent/glslang_tab.cpp"
@@ -5801,7 +5801,7 @@
                                                    {
         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) == nullptr)
+        if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
     }
 #line 5808 "MachineIndependent/glslang_tab.cpp"
@@ -5818,7 +5818,7 @@
                                                                    {
         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) == nullptr)
+        if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
     }
 #line 5825 "MachineIndependent/glslang_tab.cpp"
@@ -5834,7 +5834,7 @@
 #line 763 "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) == nullptr)
+        if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
     }
 #line 5841 "MachineIndependent/glslang_tab.cpp"
@@ -5850,7 +5850,7 @@
 #line 772 "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) == nullptr)
+        if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
     }
 #line 5857 "MachineIndependent/glslang_tab.cpp"
@@ -5866,7 +5866,7 @@
 #line 781 "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) == nullptr)
+        if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
     }
 #line 5873 "MachineIndependent/glslang_tab.cpp"
@@ -5895,7 +5895,7 @@
         parseContext.rValueErrorCheck((yyvsp[-1].lex).loc, ":", (yyvsp[-2].interm.intermTypedNode));
         parseContext.rValueErrorCheck((yyvsp[-1].lex).loc, ":", (yyvsp[0].interm.intermTypedNode));
         (yyval.interm.intermTypedNode) = parseContext.intermediate.addSelection((yyvsp[-5].interm.intermTypedNode), (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode), (yyvsp[-4].lex).loc);
-        if ((yyval.interm.intermTypedNode) == nullptr) {
+        if ((yyval.interm.intermTypedNode) == 0) {
             parseContext.binaryOpError((yyvsp[-4].lex).loc, ":", (yyvsp[-2].interm.intermTypedNode)->getCompleteString(parseContext.intermediate.getEnhancedMsgs()), (yyvsp[0].interm.intermTypedNode)->getCompleteString(parseContext.intermediate.getEnhancedMsgs()));
             (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
         }
@@ -5919,7 +5919,7 @@
         parseContext.lValueErrorCheck((yyvsp[-1].interm).loc, "assign", (yyvsp[-2].interm.intermTypedNode));
         parseContext.rValueErrorCheck((yyvsp[-1].interm).loc, "assign", (yyvsp[0].interm.intermTypedNode));
         (yyval.interm.intermTypedNode) = parseContext.addAssign((yyvsp[-1].interm).loc, (yyvsp[-1].interm).op, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
-        if ((yyval.interm.intermTypedNode) == nullptr) {
+        if ((yyval.interm.intermTypedNode) == 0) {
             parseContext.assignError((yyvsp[-1].interm).loc, "assign", (yyvsp[-2].interm.intermTypedNode)->getCompleteString(parseContext.intermediate.getEnhancedMsgs()), (yyvsp[0].interm.intermTypedNode)->getCompleteString(parseContext.intermediate.getEnhancedMsgs()));
             (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
         }
@@ -6040,7 +6040,7 @@
                                              {
         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);
-        if ((yyval.interm.intermTypedNode) == nullptr) {
+        if ((yyval.interm.intermTypedNode) == 0) {
             parseContext.binaryOpError((yyvsp[-1].lex).loc, ",", (yyvsp[-2].interm.intermTypedNode)->getCompleteString(parseContext.intermediate.getEnhancedMsgs()), (yyvsp[0].interm.intermTypedNode)->getCompleteString(parseContext.intermediate.getEnhancedMsgs()));
             (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
         }
@@ -6061,7 +6061,7 @@
 #line 894 "MachineIndependent/glslang.y"
                                    {
         parseContext.handleFunctionDeclarator((yyvsp[-1].interm).loc, *(yyvsp[-1].interm).function, true /* prototype */);
-        (yyval.interm.intermNode) = nullptr;
+        (yyval.interm.intermNode) = 0;
         // TODO: 4.0 functionality: subroutines: make the identifier a user type for this signature
     }
 #line 6068 "MachineIndependent/glslang_tab.cpp"
@@ -6073,7 +6073,7 @@
         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
         parseContext.handleFunctionDeclarator((yyvsp[-1].interm).loc, *(yyvsp[-1].interm).function, true /* prototype */);
-        (yyval.interm.intermNode) = nullptr;
+        (yyval.interm.intermNode) = 0;
         // TODO: 4.0 functionality: subroutines: make the identifier a user type for this signature
     }
 #line 6080 "MachineIndependent/glslang_tab.cpp"
@@ -6084,7 +6084,7 @@
                                                {
         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) = nullptr;
+        (yyval.interm.intermNode) = 0;
     }
 #line 6090 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -6102,11 +6102,11 @@
   case 98: /* declaration: PRECISION precision_qualifier type_specifier SEMICOLON  */
 #line 918 "MachineIndependent/glslang.y"
                                                              {
-        parseContext.profileRequires((yyvsp[-3].lex).loc, ENoProfile, 130, nullptr, "precision statement");
+        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
         parseContext.symbolTable.setPreviousDefaultPrecisions(&parseContext.defaultPrecision[0]);
         parseContext.setDefaultPrecision((yyvsp[-3].lex).loc, (yyvsp[-1].interm.type), (yyvsp[-2].interm.type).qualifier.precision);
-        (yyval.interm.intermNode) = nullptr;
+        (yyval.interm.intermNode) = 0;
     }
 #line 6112 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -6115,7 +6115,7 @@
 #line 925 "MachineIndependent/glslang.y"
                                 {
         parseContext.declareBlock((yyvsp[-1].interm).loc, *(yyvsp[-1].interm).typeList);
-        (yyval.interm.intermNode) = nullptr;
+        (yyval.interm.intermNode) = 0;
     }
 #line 6121 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -6124,7 +6124,7 @@
 #line 929 "MachineIndependent/glslang.y"
                                            {
         parseContext.declareBlock((yyvsp[-2].interm).loc, *(yyvsp[-2].interm).typeList, (yyvsp[-1].lex).string);
-        (yyval.interm.intermNode) = nullptr;
+        (yyval.interm.intermNode) = 0;
     }
 #line 6130 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -6133,7 +6133,7 @@
 #line 933 "MachineIndependent/glslang.y"
                                                            {
         parseContext.declareBlock((yyvsp[-3].interm).loc, *(yyvsp[-3].interm).typeList, (yyvsp[-2].lex).string, (yyvsp[-1].interm).arraySizes);
-        (yyval.interm.intermNode) = nullptr;
+        (yyval.interm.intermNode) = 0;
     }
 #line 6139 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -6143,7 +6143,7 @@
                                {
         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) = nullptr;
+        (yyval.interm.intermNode) = 0;
     }
 #line 6149 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -6153,7 +6153,7 @@
                                           {
         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].lex).string);
-        (yyval.interm.intermNode) = nullptr;
+        (yyval.interm.intermNode) = 0;
     }
 #line 6159 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -6164,7 +6164,7 @@
         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) = nullptr;
+        (yyval.interm.intermNode) = 0;
     }
 #line 6170 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -6330,7 +6330,7 @@
                                 {
         if ((yyvsp[-1].interm.type).arraySizes) {
             parseContext.profileRequires((yyvsp[-1].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
-            parseContext.profileRequires((yyvsp[-1].interm.type).loc, EEsProfile, 300, nullptr, "arrayed type");
+            parseContext.profileRequires((yyvsp[-1].interm.type).loc, EEsProfile, 300, 0, "arrayed type");
             parseContext.arraySizeRequiredCheck((yyvsp[-1].interm.type).loc, *(yyvsp[-1].interm.type).arraySizes);
         }
         if ((yyvsp[-1].interm.type).basicType == EbtVoid) {
@@ -6350,7 +6350,7 @@
                                                 {
         if ((yyvsp[-2].interm.type).arraySizes) {
             parseContext.profileRequires((yyvsp[-2].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
-            parseContext.profileRequires((yyvsp[-2].interm.type).loc, EEsProfile, 300, nullptr, "arrayed type");
+            parseContext.profileRequires((yyvsp[-2].interm.type).loc, EEsProfile, 300, 0, "arrayed type");
             parseContext.arraySizeRequiredCheck((yyvsp[-2].interm.type).loc, *(yyvsp[-2].interm.type).arraySizes);
         }
         TType* type = new TType((yyvsp[-2].interm.type));
@@ -6427,7 +6427,7 @@
   case 124: /* parameter_type_specifier: type_specifier  */
 #line 1146 "MachineIndependent/glslang.y"
                      {
-        TParameter param = { nullptr, new TType((yyvsp[0].interm.type)) };
+        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);
@@ -6475,7 +6475,7 @@
 #line 1171 "MachineIndependent/glslang.y"
                                                               {
         (yyval.interm).type = (yyvsp[-4].interm).type;
-        TIntermNode* initNode = parseContext.declareVariable((yyvsp[-2].lex).loc, *(yyvsp[-2].lex).string, (yyvsp[-4].interm).type, nullptr, (yyvsp[0].interm.intermTypedNode));
+        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 6482 "MachineIndependent/glslang_tab.cpp"
@@ -6485,7 +6485,7 @@
 #line 1179 "MachineIndependent/glslang.y"
                            {
         (yyval.interm).type = (yyvsp[0].interm.type);
-        (yyval.interm).intermNode = nullptr;
+        (yyval.interm).intermNode = 0;
 
         parseContext.declareTypeDefaults((yyval.interm).loc, (yyval.interm).type);
 
@@ -6497,7 +6497,7 @@
 #line 1186 "MachineIndependent/glslang.y"
                                       {
         (yyval.interm).type = (yyvsp[-1].interm.type);
-        (yyval.interm).intermNode = nullptr;
+        (yyval.interm).intermNode = 0;
         parseContext.declareVariable((yyvsp[0].lex).loc, *(yyvsp[0].lex).string, (yyvsp[-1].interm.type));
     }
 #line 6504 "MachineIndependent/glslang_tab.cpp"
@@ -6507,7 +6507,7 @@
 #line 1191 "MachineIndependent/glslang.y"
                                                       {
         (yyval.interm).type = (yyvsp[-2].interm.type);
-        (yyval.interm).intermNode = nullptr;
+        (yyval.interm).intermNode = 0;
         parseContext.declareVariable((yyvsp[-1].lex).loc, *(yyvsp[-1].lex).string, (yyvsp[-2].interm.type), (yyvsp[0].interm).arraySizes);
     }
 #line 6514 "MachineIndependent/glslang_tab.cpp"
@@ -6518,7 +6518,7 @@
                                                                         {
         (yyval.interm).type = (yyvsp[-4].interm.type);
         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(nullptr, initNode, (yyvsp[-1].lex).loc);
+        (yyval.interm).intermNode = parseContext.intermediate.growAggregate(0, initNode, (yyvsp[-1].lex).loc);
     }
 #line 6524 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -6527,8 +6527,8 @@
 #line 1201 "MachineIndependent/glslang.y"
                                                         {
         (yyval.interm).type = (yyvsp[-3].interm.type);
-        TIntermNode* initNode = parseContext.declareVariable((yyvsp[-2].lex).loc, *(yyvsp[-2].lex).string, (yyvsp[-3].interm.type), nullptr, (yyvsp[0].interm.intermTypedNode));
-        (yyval.interm).intermNode = parseContext.intermediate.growAggregate(nullptr, initNode, (yyvsp[-1].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 6534 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -6541,7 +6541,7 @@
         parseContext.globalQualifierTypeCheck((yyvsp[0].interm.type).loc, (yyvsp[0].interm.type).qualifier, (yyval.interm.type));
         if ((yyvsp[0].interm.type).arraySizes) {
             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, nullptr, "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);
     }
@@ -6556,7 +6556,7 @@
 
         if ((yyvsp[0].interm.type).arraySizes) {
             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, nullptr, "arrayed type");
+            parseContext.profileRequires((yyvsp[0].interm.type).loc, EEsProfile, 300, 0, "arrayed type");
         }
 
         if ((yyvsp[0].interm.type).arraySizes && parseContext.arrayQualifierError((yyvsp[0].interm.type).loc, (yyvsp[-1].interm.type).qualifier))
@@ -6581,7 +6581,7 @@
 #line 1247 "MachineIndependent/glslang.y"
                 {
         parseContext.globalCheck((yyvsp[0].lex).loc, "invariant");
-        parseContext.profileRequires((yyval.interm.type).loc, ENoProfile, 120, nullptr, "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;
     }
@@ -6592,8 +6592,8 @@
 #line 1256 "MachineIndependent/glslang.y"
              {
         parseContext.globalCheck((yyvsp[0].lex).loc, "smooth");
-        parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, nullptr, "smooth");
-        parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 300, nullptr, "smooth");
+        parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "smooth");
+        parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 300, 0, "smooth");
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.smooth = true;
     }
@@ -6604,8 +6604,8 @@
 #line 1263 "MachineIndependent/glslang.y"
            {
         parseContext.globalCheck((yyvsp[0].lex).loc, "flat");
-        parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, nullptr, "flat");
-        parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 300, nullptr, "flat");
+        parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "flat");
+        parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 300, 0, "flat");
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.flat = true;
     }
@@ -6617,7 +6617,7 @@
                     {
         parseContext.globalCheck((yyvsp[0].lex).loc, "noperspective");
         parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 0, E_GL_NV_shader_noperspective_interpolation, "noperspective");
-        parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, nullptr, "noperspective");
+        parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "noperspective");
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.nopersp = true;
     }
@@ -6945,8 +6945,8 @@
   case 172: /* storage_qualifier: CENTROID  */
 #line 1466 "MachineIndependent/glslang.y"
                {
-        parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 120, nullptr, "centroid");
-        parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 300, nullptr, "centroid");
+        parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 120, 0, "centroid");
+        parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 300, 0, "centroid");
         parseContext.globalCheck((yyvsp[0].lex).loc, "centroid");
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.centroid = true;
@@ -6969,7 +6969,7 @@
              {
         parseContext.globalCheck((yyvsp[0].lex).loc, "shared");
         parseContext.profileRequires((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, 430, E_GL_ARB_compute_shader, "shared");
-        parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 310, nullptr, "shared");
+        parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 310, 0, "shared");
         parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangComputeMask | EShLangMeshMask | EShLangTaskMask), "shared");
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.storage = EvqShared;
@@ -7415,7 +7415,7 @@
   case 214: /* type_parameter_specifier_opt: %empty  */
 #line 1745 "MachineIndependent/glslang.y"
                         {
-        (yyval.interm.typeParameters) = nullptr;
+        (yyval.interm.typeParameters) = 0;
     }
 #line 7421 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -10779,7 +10779,7 @@
   case 533: /* precision_qualifier: HIGH_PRECISION  */
 #line 3534 "MachineIndependent/glslang.y"
                      {
-        parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, nullptr, "highp precision qualifier");
+        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);
     }
@@ -10789,7 +10789,7 @@
   case 534: /* precision_qualifier: MEDIUM_PRECISION  */
 #line 3539 "MachineIndependent/glslang.y"
                        {
-        parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, nullptr, "mediump precision qualifier");
+        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);
     }
@@ -10799,7 +10799,7 @@
   case 535: /* precision_qualifier: LOW_PRECISION  */
 #line 3544 "MachineIndependent/glslang.y"
                     {
-        parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, nullptr, "lowp precision qualifier");
+        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);
     }
@@ -10874,7 +10874,7 @@
                                                       {
         if ((yyvsp[-2].interm.type).arraySizes) {
             parseContext.profileRequires((yyvsp[-2].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
-            parseContext.profileRequires((yyvsp[-2].interm.type).loc, EEsProfile, 300, nullptr, "arrayed type");
+            parseContext.profileRequires((yyvsp[-2].interm.type).loc, EEsProfile, 300, 0, "arrayed type");
             if (parseContext.isEsProfile())
                 parseContext.arraySizeRequiredCheck((yyvsp[-2].interm.type).loc, *(yyvsp[-2].interm.type).arraySizes);
         }
@@ -10901,7 +10901,7 @@
                                                                      {
         if ((yyvsp[-2].interm.type).arraySizes) {
             parseContext.profileRequires((yyvsp[-2].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
-            parseContext.profileRequires((yyvsp[-2].interm.type).loc, EEsProfile, 300, nullptr, "arrayed type");
+            parseContext.profileRequires((yyvsp[-2].interm.type).loc, EEsProfile, 300, 0, "arrayed type");
             if (parseContext.isEsProfile())
                 parseContext.arraySizeRequiredCheck((yyvsp[-2].interm.type).loc, *(yyvsp[-2].interm.type).arraySizes);
         }
@@ -11009,7 +11009,7 @@
   case 552: /* initializer_list: initializer  */
 #line 3691 "MachineIndependent/glslang.y"
                   {
-        (yyval.interm.intermTypedNode) = parseContext.intermediate.growAggregate(nullptr, (yyvsp[0].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode)->getLoc());
+        (yyval.interm.intermTypedNode) = parseContext.intermediate.growAggregate(0, (yyvsp[0].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode)->getLoc());
     }
 #line 11015 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -11100,7 +11100,7 @@
 
   case 566: /* compound_statement: LEFT_BRACE RIGHT_BRACE  */
 #line 3735 "MachineIndependent/glslang.y"
-                             { (yyval.interm.intermNode) = nullptr; }
+                             { (yyval.interm.intermNode) = 0; }
 #line 11105 "MachineIndependent/glslang_tab.cpp"
     break;
 
@@ -11185,7 +11185,7 @@
   case 576: /* compound_statement_no_new_scope: LEFT_BRACE RIGHT_BRACE  */
 #line 3778 "MachineIndependent/glslang.y"
                              {
-        (yyval.interm.intermNode) = nullptr;
+        (yyval.interm.intermNode) = 0;
     }
 #line 11191 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -11206,8 +11206,8 @@
         (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 ||
                                             (yyvsp[0].interm.intermNode)->getAsBranchNode()->getFlowOp() == EOpDefault)) {
-            parseContext.wrapupSwitchSubsequence(nullptr, (yyvsp[0].interm.intermNode));
-            (yyval.interm.intermNode) = nullptr;  // start a fresh subsequence for what's after this case
+            parseContext.wrapupSwitchSubsequence(0, (yyvsp[0].interm.intermNode));
+            (yyval.interm.intermNode) = 0;  // start a fresh subsequence for what's after this case
         }
     }
 #line 11214 "MachineIndependent/glslang_tab.cpp"
@@ -11218,8 +11218,8 @@
                                {
         if ((yyvsp[0].interm.intermNode) && (yyvsp[0].interm.intermNode)->getAsBranchNode() && ((yyvsp[0].interm.intermNode)->getAsBranchNode()->getFlowOp() == EOpCase ||
                                             (yyvsp[0].interm.intermNode)->getAsBranchNode()->getFlowOp() == EOpDefault)) {
-            parseContext.wrapupSwitchSubsequence((yyvsp[-1].interm.intermNode) ? (yyvsp[-1].interm.intermNode)->getAsAggregate() : nullptr, (yyvsp[0].interm.intermNode));
-            (yyval.interm.intermNode) = nullptr;  // start a fresh subsequence for what's after this case
+            parseContext.wrapupSwitchSubsequence((yyvsp[-1].interm.intermNode) ? (yyvsp[-1].interm.intermNode)->getAsAggregate() : 0, (yyvsp[0].interm.intermNode));
+            (yyval.interm.intermNode) = 0;  // start a fresh subsequence for what's after this case
         } else
             (yyval.interm.intermNode) = parseContext.intermediate.growAggregate((yyvsp[-1].interm.intermNode), (yyvsp[0].interm.intermNode));
     }
@@ -11228,7 +11228,7 @@
 
   case 580: /* expression_statement: SEMICOLON  */
 #line 3808 "MachineIndependent/glslang.y"
-                 { (yyval.interm.intermNode) = nullptr; }
+                 { (yyval.interm.intermNode) = 0; }
 #line 11233 "MachineIndependent/glslang_tab.cpp"
     break;
 
@@ -11278,7 +11278,7 @@
 #line 3836 "MachineIndependent/glslang.y"
                        {
         (yyval.interm.nodePair).node1 = (yyvsp[0].interm.intermNode);
-        (yyval.interm.nodePair).node2 = nullptr;
+        (yyval.interm.nodePair).node2 = 0;
     }
 #line 11284 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -11298,11 +11298,11 @@
         parseContext.boolCheck((yyvsp[-2].lex).loc, (yyvsp[-3].interm.type));
 
         TType type((yyvsp[-3].interm.type));
-        TIntermNode* initNode = parseContext.declareVariable((yyvsp[-2].lex).loc, *(yyvsp[-2].lex).string, (yyvsp[-3].interm.type), nullptr, (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) = nullptr;
+            (yyval.interm.intermTypedNode) = 0;
     }
 #line 11308 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -11341,7 +11341,7 @@
   case 592: /* switch_statement_nonattributed: SWITCH LEFT_PAREN expression RIGHT_PAREN $@9 LEFT_BRACE switch_statement_list RIGHT_BRACE  */
 #line 3881 "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() : nullptr);
+        (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();
         parseContext.switchSequenceStack.pop_back();
         parseContext.switchLevel.pop_back();
@@ -11355,7 +11355,7 @@
   case 593: /* switch_statement_list: %empty  */
 #line 3893 "MachineIndependent/glslang.y"
                     {
-        (yyval.interm.intermNode) = nullptr;
+        (yyval.interm.intermNode) = 0;
     }
 #line 11361 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -11371,7 +11371,7 @@
   case 595: /* case_label: CASE expression COLON  */
 #line 3902 "MachineIndependent/glslang.y"
                             {
-        (yyval.interm.intermNode) = nullptr;
+        (yyval.interm.intermNode) = 0;
         if (parseContext.switchLevel.size() == 0)
             parseContext.error((yyvsp[-2].lex).loc, "cannot appear outside switch statement", "case", "");
         else if (parseContext.switchLevel.back() != parseContext.statementNestingLevel)
@@ -11388,7 +11388,7 @@
   case 596: /* case_label: DEFAULT COLON  */
 #line 3914 "MachineIndependent/glslang.y"
                     {
-        (yyval.interm.intermNode) = nullptr;
+        (yyval.interm.intermNode) = 0;
         if (parseContext.switchLevel.size() == 0)
             parseContext.error((yyvsp[-1].lex).loc, "cannot appear outside switch statement", "default", "");
         else if (parseContext.switchLevel.back() != parseContext.statementNestingLevel)
@@ -11434,7 +11434,7 @@
 #line 3946 "MachineIndependent/glslang.y"
                                                    {
         parseContext.symbolTable.pop(&parseContext.defaultPrecision[0]);
-        (yyval.interm.intermNode) = parseContext.intermediate.addLoop((yyvsp[0].interm.intermNode), (yyvsp[-2].interm.intermTypedNode), nullptr, true, (yyvsp[-5].lex).loc);
+        (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;
@@ -11461,7 +11461,7 @@
 
         parseContext.boolCheck((yyvsp[0].lex).loc, (yyvsp[-2].interm.intermTypedNode));
 
-        (yyval.interm.intermNode) = parseContext.intermediate.addLoop((yyvsp[-5].interm.intermNode), (yyvsp[-2].interm.intermTypedNode), nullptr, false, (yyvsp[-4].lex).loc);
+        (yyval.interm.intermNode) = parseContext.intermediate.addLoop((yyvsp[-5].interm.intermNode), (yyvsp[-2].interm.intermTypedNode), 0, false, (yyvsp[-4].lex).loc);
         parseContext.symbolTable.pop(&parseContext.defaultPrecision[0]);
         --parseContext.loopNestingLevel;
         --parseContext.statementNestingLevel;
@@ -11525,7 +11525,7 @@
   case 608: /* conditionopt: %empty  */
 #line 4004 "MachineIndependent/glslang.y"
                         {
-        (yyval.interm.intermTypedNode) = nullptr;
+        (yyval.interm.intermTypedNode) = 0;
     }
 #line 11531 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -11534,7 +11534,7 @@
 #line 4010 "MachineIndependent/glslang.y"
                              {
         (yyval.interm.nodePair).node1 = (yyvsp[-1].interm.intermTypedNode);
-        (yyval.interm.nodePair).node2 = nullptr;
+        (yyval.interm.nodePair).node2 = 0;
     }
 #line 11540 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -11826,7 +11826,7 @@
 #line 4190 "MachineIndependent/glslang.y"
                                                               {
         parseContext.intermediate.insertSpirvExecutionMode((yyvsp[-1].lex).i);
-        (yyval.interm.intermNode) = nullptr;
+        (yyval.interm.intermNode) = 0;
     }
 #line 11832 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -11836,7 +11836,7 @@
                                                                                             {
         parseContext.intermediate.insertSpirvRequirement((yyvsp[-3].interm.spirvReq));
         parseContext.intermediate.insertSpirvExecutionMode((yyvsp[-1].lex).i);
-        (yyval.interm.intermNode) = nullptr;
+        (yyval.interm.intermNode) = 0;
     }
 #line 11842 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -11845,7 +11845,7 @@
 #line 4199 "MachineIndependent/glslang.y"
                                                                                                         {
         parseContext.intermediate.insertSpirvExecutionMode((yyvsp[-3].lex).i, (yyvsp[-1].interm.intermNode)->getAsAggregate());
-        (yyval.interm.intermNode) = nullptr;
+        (yyval.interm.intermNode) = 0;
     }
 #line 11851 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -11855,7 +11855,7 @@
                                                                                                                                       {
         parseContext.intermediate.insertSpirvRequirement((yyvsp[-5].interm.spirvReq));
         parseContext.intermediate.insertSpirvExecutionMode((yyvsp[-3].lex).i, (yyvsp[-1].interm.intermNode)->getAsAggregate());
-        (yyval.interm.intermNode) = nullptr;
+        (yyval.interm.intermNode) = 0;
     }
 #line 11861 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -11864,7 +11864,7 @@
 #line 4208 "MachineIndependent/glslang.y"
                                                                                                               {
         parseContext.intermediate.insertSpirvExecutionModeId((yyvsp[-3].lex).i, (yyvsp[-1].interm.intermNode)->getAsAggregate());
-        (yyval.interm.intermNode) = nullptr;
+        (yyval.interm.intermNode) = 0;
     }
 #line 11870 "MachineIndependent/glslang_tab.cpp"
     break;
@@ -11874,7 +11874,7 @@
                                                                                                                                             {
         parseContext.intermediate.insertSpirvRequirement((yyvsp[-5].interm.spirvReq));
         parseContext.intermediate.insertSpirvExecutionModeId((yyvsp[-3].lex).i, (yyvsp[-1].interm.intermNode)->getAsAggregate());
-        (yyval.interm.intermNode) = nullptr;
+        (yyval.interm.intermNode) = 0;
     }
 #line 11880 "MachineIndependent/glslang_tab.cpp"
     break;
diff --git a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/intermOut.cpp b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/intermOut.cpp
index f797ada..a79a692 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/intermOut.cpp
+++ b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/intermOut.cpp
@@ -1552,7 +1552,7 @@
         break;
     }
 
-    if (treeRoot == nullptr || ! tree)
+    if (treeRoot == 0 || ! tree)
         return;
 
     TOutputTraverser it(infoSink);
diff --git a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/linkValidate.cpp b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/linkValidate.cpp
index ff97614..fab65a7 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/linkValidate.cpp
+++ b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/linkValidate.cpp
@@ -1383,7 +1383,7 @@
     TCall* newRoot;
     do {
         // See if we have unvisited parts of the graph.
-        newRoot = nullptr;
+        newRoot = 0;
         for (TGraph::iterator call = callGraph.begin(); call != callGraph.end(); ++call) {
             if (! call->visited) {
                 newRoot = &(*call);
diff --git a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/localintermediate.h b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/localintermediate.h
index b9ad7db..1bb4e97 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/localintermediate.h
+++ b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/localintermediate.h
@@ -284,7 +284,7 @@
     explicit TIntermediate(EShLanguage l, int v = 0, EProfile p = ENoProfile) :
         language(l),
         profile(p), version(v),
-        treeRoot(nullptr),
+        treeRoot(0),
         resources(TBuiltInResource{}),
         numEntryPoints(0), numErrors(0), numPushConstants(0), recursive(false),
         invertY(false),
diff --git a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/parseConst.cpp b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/parseConst.cpp
index 8350972..6c18299 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/parseConst.cpp
+++ b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/parseConst.cpp
@@ -198,7 +198,7 @@
 
 bool TIntermediate::parseConstTree(TIntermNode* root, TConstUnionArray unionArray, TOperator constructorType, const TType& t, bool singleConstantParam)
 {
-    if (root == nullptr)
+    if (root == 0)
         return false;
 
     TConstTraverser it(unionArray, singleConstantParam, constructorType, t);
diff --git a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/parseVersions.h b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/parseVersions.h
index cdf4524..3c52ff1 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/parseVersions.h
+++ b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/parseVersions.h
@@ -65,7 +65,7 @@
         infoSink(infoSink), version(version), 
         language(language),
         spvVersion(spvVersion), 
-        intermediate(interm), messages(messages), numErrors(0), currentScanner(nullptr) { }
+        intermediate(interm), messages(messages), numErrors(0), currentScanner(0) { }
     virtual ~TParseVersions() { }
     void requireStage(const TSourceLoc&, EShLanguageMask, const char* featureDesc);
     void requireStage(const TSourceLoc&, EShLanguage, const char* featureDesc);
diff --git a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpContext.cpp b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpContext.cpp
index 70f5119..1363ce2 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpContext.cpp
+++ b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpContext.cpp
@@ -85,7 +85,7 @@
 namespace glslang {
 
 TPpContext::TPpContext(TParseContextBase& pc, const std::string& rootFileName, TShader::Includer& inclr) :
-    preamble(nullptr), strings(nullptr), previous_token('\n'), parseContext(pc), includer(inclr), inComment(false),
+    preamble(0), strings(0), previous_token('\n'), parseContext(pc), includer(inclr), inComment(false),
     rootFileName(rootFileName),
     currentSourceFile(rootFileName),
     disableEscapeSequences(false)
diff --git a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpTokens.cpp b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpTokens.cpp
index e17eeaf..7ed5870 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpTokens.cpp
+++ b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpTokens.cpp
@@ -121,7 +121,7 @@
     if (atom == '#') {
         if (peekToken('#')) {
             parseContext.requireProfile(ppToken->loc, ~EEsProfile, "token pasting (##)");
-            parseContext.profileRequires(ppToken->loc, ~EEsProfile, 130, nullptr, "token pasting (##)");
+            parseContext.profileRequires(ppToken->loc, ~EEsProfile, 130, 0, "token pasting (##)");
             currentPos++;
             atom = PpAtomPaste;
         }
diff --git a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/propagateNoContraction.cpp b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/propagateNoContraction.cpp
index a1aa5ea..9def592 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/propagateNoContraction.cpp
+++ b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/propagateNoContraction.cpp
@@ -423,7 +423,7 @@
                                         ReturnBranchNodeSet());
 
     TIntermNode* root = intermediate.getTreeRoot();
-    if (root == nullptr)
+    if (root == 0)
         return result_tuple;
 
     NodeMapping& symbol_definition_mapping = std::get<0>(result_tuple);
diff --git a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/reflection.cpp b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/reflection.cpp
index 144f85b..3061ff7 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/reflection.cpp
+++ b/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/reflection.cpp
@@ -682,7 +682,7 @@
     }
 
     // For a binary operation indexing into an aggregate, chase down the base of the aggregate.
-    // Return nullptr if the topology does not fit this situation.
+    // Return 0 if the topology does not fit this situation.
     TIntermSymbol* findBase(const TIntermBinary* node)
     {
         TIntermSymbol *base = node->getLeft()->getAsSymbolNode();
diff --git a/third_party/vulkan-deps/glslang/src/glslang/OSDependent/Unix/ossource.cpp b/third_party/vulkan-deps/glslang/src/glslang/OSDependent/Unix/ossource.cpp
index 9a31a9a..b98df93 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/OSDependent/Unix/ossource.cpp
+++ b/third_party/vulkan-deps/glslang/src/glslang/OSDependent/Unix/ossource.cpp
@@ -76,7 +76,7 @@
     //
     // Create global pool key.
     //
-    if ((pthread_key_create(&pPoolIndex, nullptr)) != 0) {
+    if ((pthread_key_create(&pPoolIndex, NULL)) != 0) {
         assert(0 && "OS_AllocTLSIndex(): Unable to allocate Thread Local Storage");
         return OS_INVALID_TLS_INDEX;
     }
diff --git a/third_party/vulkan-deps/glslang/src/glslang/OSDependent/Windows/ossource.cpp b/third_party/vulkan-deps/glslang/src/glslang/OSDependent/Windows/ossource.cpp
index fa372a2..870840c 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/OSDependent/Windows/ossource.cpp
+++ b/third_party/vulkan-deps/glslang/src/glslang/OSDependent/Windows/ossource.cpp
@@ -113,7 +113,7 @@
 
 void InitGlobalLock()
 {
-    GlobalLock = CreateMutex(nullptr, false, nullptr);
+    GlobalLock = CreateMutex(0, false, 0);
 }
 
 void GetGlobalLock()
@@ -128,7 +128,7 @@
 
 unsigned int __stdcall EnterGenericThread (void* entry)
 {
-    return ((TThreadEntrypoint)entry)(nullptr);
+    return ((TThreadEntrypoint)entry)(0);
 }
 
 //#define DUMP_COUNTERS
diff --git a/third_party/vulkan-deps/glslang/src/glslang/OSDependent/osinclude.h b/third_party/vulkan-deps/glslang/src/glslang/OSDependent/osinclude.h
index 7eaa113..fcfeff2 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/OSDependent/osinclude.h
+++ b/third_party/vulkan-deps/glslang/src/glslang/OSDependent/osinclude.h
@@ -41,7 +41,7 @@
 // Thread Local Storage Operations
 //
 typedef void* OS_TLSIndex;
-#define OS_INVALID_TLS_INDEX nullptr
+#define OS_INVALID_TLS_INDEX ((void*)0)
 
 OS_TLSIndex OS_AllocTLSIndex();
 bool        OS_SetTLSValue(OS_TLSIndex nIndex, void *lpvValue);
diff --git a/third_party/vulkan-deps/glslang/src/known_good.json b/third_party/vulkan-deps/glslang/src/known_good.json
index b0ceead..5ee36a2 100644
--- a/third_party/vulkan-deps/glslang/src/known_good.json
+++ b/third_party/vulkan-deps/glslang/src/known_good.json
@@ -5,14 +5,14 @@
       "site" : "github",
       "subrepo" : "KhronosGroup/SPIRV-Tools",
       "subdir" : "External/spirv-tools",
-      "commit" : "d9446130d5165f7fafcb3599252a22e264c7d4bd"
+      "commit" : "eb0a36633d2acf4de82588504f951ad0f2cecacb"
     },
     {
       "name" : "spirv-tools/external/spirv-headers",
       "site" : "github",
       "subrepo" : "KhronosGroup/SPIRV-Headers",
       "subdir" : "External/spirv-tools/external/spirv-headers",
-      "commit" : "c214f6f2d1a7253bb0e9f195c2dc5b0659dc99ef"
+      "commit" : "85a1ed200d50660786c1a88d9166e871123cce39"
     }
   ]
 }
diff --git a/third_party/vulkan-deps/spirv-headers/src/include/spirv/spir-v.xml b/third_party/vulkan-deps/spirv-headers/src/include/spirv/spir-v.xml
index 642fdf3..dad141b 100644
--- a/third_party/vulkan-deps/spirv-headers/src/include/spirv/spir-v.xml
+++ b/third_party/vulkan-deps/spirv-headers/src/include/spirv/spir-v.xml
@@ -62,7 +62,7 @@
         <id value="9"   vendor="Qualcomm"   comment="Contact weifengz@qti.qualcomm.com"/>
         <id value="10"  vendor="AMD"        comment="Contact Daniel Rakos, daniel.rakos@amd.com"/>
         <id value="11"  vendor="Intel"      comment="Contact Alexey, alexey.bader@intel.com"/>
-        <id value="12"  vendor="Imagination" comment="Contact Stephen Clarke, stephen.clarke@imgtec.com"/>
+        <id value="12"  vendor="Imagination" comment="Contact James Jones"/>
         <id value="13"  vendor="Google" tool="Shaderc over Glslang" comment="Contact David Neto, dneto@google.com"/>
         <id value="14"  vendor="Google" tool="spiregg" comment="Contact Lei Zhang, antiagainst@google.com"/>
         <id value="15"  vendor="Google" tool="rspirv" comment="Contact Lei Zhang, antiagainst@gmail.com"/>
@@ -86,8 +86,7 @@
         <id value="33"  vendor="DragonJoker" tool="ShaderWriter" comment="Contact Sylvain Doremus, https://github.com/DragonJoker/ShaderWriter"/>
         <id value="34"  vendor="Rayan Hatout" tool="SPIRVSmith" comment="Contact Rayan Hatout rayan.hatout@gmail.com, Repo https://github.com/rayanht/SPIRVSmith"/>
         <id value="35"  vendor="Saarland University" tool="Shady" comment="Contact Hugo Devillers devillers@uni-saarland.de, Repo https://github.com/Hugobros3/shady"/>
-        <id value="36"  vendor="Taichi Graphics" tool="Taichi" comment="Contact Rendong Liang rendongliang@taichi.graphics, Repo https://github.com/taichi-dev/taichi"/>
-        <unused start="37" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
+        <unused start="36" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
     </ids>
 
     <!-- SECTION: SPIR-V Opcodes and Enumerants -->
diff --git a/third_party/vulkan-deps/spirv-tools/src/BUILD.gn b/third_party/vulkan-deps/spirv-tools/src/BUILD.gn
index a375e9d..14d431b 100644
--- a/third_party/vulkan-deps/spirv-tools/src/BUILD.gn
+++ b/third_party/vulkan-deps/spirv-tools/src/BUILD.gn
@@ -539,7 +539,6 @@
     "source/val/validate_primitives.cpp",
     "source/val/validate_ray_query.cpp",
     "source/val/validate_ray_tracing.cpp",
-    "source/val/validate_ray_tracing_reorder.cpp",
     "source/val/validate_scopes.cpp",
     "source/val/validate_scopes.h",
     "source/val/validate_small_type_uses.cpp",
@@ -633,8 +632,8 @@
     "source/opt/eliminate_dead_functions_pass.h",
     "source/opt/eliminate_dead_functions_util.cpp",
     "source/opt/eliminate_dead_functions_util.h",
-    "source/opt/eliminate_dead_io_components_pass.cpp",
-    "source/opt/eliminate_dead_io_components_pass.h",
+    "source/opt/eliminate_dead_input_components_pass.cpp",
+    "source/opt/eliminate_dead_input_components_pass.h",
     "source/opt/eliminate_dead_members_pass.cpp",
     "source/opt/eliminate_dead_members_pass.h",
     "source/opt/eliminate_dead_output_stores_pass.cpp",
diff --git a/third_party/vulkan-deps/spirv-tools/src/include/spirv-tools/optimizer.hpp b/third_party/vulkan-deps/spirv-tools/src/include/spirv-tools/optimizer.hpp
index aa6a614..41752d6 100644
--- a/third_party/vulkan-deps/spirv-tools/src/include/spirv-tools/optimizer.hpp
+++ b/third_party/vulkan-deps/spirv-tools/src/include/spirv-tools/optimizer.hpp
@@ -521,12 +521,8 @@
 // interface are considered live and are not eliminated. This mode is needed
 // by GPU-Assisted validation instrumentation, where a change in the interface
 // is not allowed.
-//
-// If |remove_outputs| is true, allow outputs to be removed from the interface.
-// This is only safe if the caller knows that there is no corresponding input
-// variable in the following shader. It is false by default.
-Optimizer::PassToken CreateAggressiveDCEPass(bool preserve_interface = false,
-                                             bool remove_outputs = false);
+Optimizer::PassToken CreateAggressiveDCEPass();
+Optimizer::PassToken CreateAggressiveDCEPass(bool preserve_interface);
 
 // Creates a remove-unused-interface-variables pass.
 // Removes variables referenced on the |OpEntryPoint| instruction that are not
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/CMakeLists.txt b/third_party/vulkan-deps/spirv-tools/src/source/CMakeLists.txt
index e85ec9d..f904024 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/CMakeLists.txt
+++ b/third_party/vulkan-deps/spirv-tools/src/source/CMakeLists.txt
@@ -328,7 +328,6 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/val/validate_primitives.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/val/validate_ray_query.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/val/validate_ray_tracing.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/val/validate_ray_tracing_reorder.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/val/validate_scopes.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/val/validate_small_type_uses.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/val/validate_type.cpp
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/opcode.cpp b/third_party/vulkan-deps/spirv-tools/src/source/opcode.cpp
index b1785cc..c5006af 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/opcode.cpp
+++ b/third_party/vulkan-deps/spirv-tools/src/source/opcode.cpp
@@ -342,7 +342,6 @@
     // case spv::Op::OpTypeAccelerationStructureKHR: covered by
     // spv::Op::OpTypeAccelerationStructureNV
     case spv::Op::OpTypeRayQueryKHR:
-    case spv::Op::OpTypeHitObjectNV:
       return true;
     default:
       // In particular, OpTypeForwardPointer does not generate a type,
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/opt/CMakeLists.txt b/third_party/vulkan-deps/spirv-tools/src/source/opt/CMakeLists.txt
index c34c38d..085c430 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/opt/CMakeLists.txt
+++ b/third_party/vulkan-deps/spirv-tools/src/source/opt/CMakeLists.txt
@@ -47,7 +47,7 @@
   eliminate_dead_constant_pass.h
   eliminate_dead_functions_pass.h
   eliminate_dead_functions_util.h
-  eliminate_dead_io_components_pass.h
+  eliminate_dead_input_components_pass.h
   eliminate_dead_members_pass.h
   eliminate_dead_output_stores_pass.h
   empty_pass.h
@@ -166,7 +166,7 @@
   eliminate_dead_constant_pass.cpp
   eliminate_dead_functions_pass.cpp
   eliminate_dead_functions_util.cpp
-  eliminate_dead_io_components_pass.cpp
+  eliminate_dead_input_components_pass.cpp
   eliminate_dead_members_pass.cpp
   eliminate_dead_output_stores_pass.cpp
   feature_manager.cpp
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/opt/aggressive_dead_code_elim_pass.cpp b/third_party/vulkan-deps/spirv-tools/src/source/opt/aggressive_dead_code_elim_pass.cpp
index 53d13f1..f68032d 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/opt/aggressive_dead_code_elim_pass.cpp
+++ b/third_party/vulkan-deps/spirv-tools/src/source/opt/aggressive_dead_code_elim_pass.cpp
@@ -579,10 +579,8 @@
         auto* var = get_def_use_mgr()->GetDef(entry.GetSingleWordInOperand(i));
         auto storage_class = var->GetSingleWordInOperand(0u);
         // Vulkan support outputs without an associated input, but not inputs
-        // without an associated output. Don't remove outputs unless explicitly
-        // allowed.
-        if (!remove_outputs_ &&
-            spv::StorageClass(storage_class) == spv::StorageClass::Output) {
+        // without an associated output.
+        if (spv::StorageClass(storage_class) == spv::StorageClass::Output) {
           AddToWorklist(var);
         }
       }
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/opt/aggressive_dead_code_elim_pass.h b/third_party/vulkan-deps/spirv-tools/src/source/opt/aggressive_dead_code_elim_pass.h
index fbe08ad..99c4739 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/opt/aggressive_dead_code_elim_pass.h
+++ b/third_party/vulkan-deps/spirv-tools/src/source/opt/aggressive_dead_code_elim_pass.h
@@ -44,10 +44,8 @@
   using GetBlocksFunction =
       std::function<std::vector<BasicBlock*>*(const BasicBlock*)>;
 
-  AggressiveDCEPass(bool preserve_interface = false,
-                    bool remove_outputs = false)
-      : preserve_interface_(preserve_interface),
-        remove_outputs_(remove_outputs) {}
+  AggressiveDCEPass(bool preserve_interface = false)
+      : preserve_interface_(preserve_interface) {}
 
   const char* name() const override { return "eliminate-dead-code-aggressive"; }
   Status Process() override;
@@ -65,11 +63,6 @@
   // is not allowed.
   bool preserve_interface_;
 
-  // Output variables can be removed from the interface if this is true.
-  // This is safe if the caller knows that the corresponding input variable
-  // in the following shader has been removed. It is false by default.
-  bool remove_outputs_;
-
   // Return true if |varId| is a variable of |storageClass|. |varId| must either
   // be 0 or the result of an instruction.
   bool IsVarOfStorage(uint32_t varId, spv::StorageClass storageClass);
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/opt/const_folding_rules.cpp b/third_party/vulkan-deps/spirv-tools/src/source/opt/const_folding_rules.cpp
index 19b39d6..e91455e 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/opt/const_folding_rules.cpp
+++ b/third_party/vulkan-deps/spirv-tools/src/source/opt/const_folding_rules.cpp
@@ -140,12 +140,6 @@
     // Work down hierarchy and add all the indexes, not including the final
     // index.
     for (uint32_t i = 2; i < inst->NumInOperands(); ++i) {
-      if (composite->AsNullConstant()) {
-        // Return Null for the return type.
-        analysis::TypeManager* type_mgr = context->get_type_mgr();
-        return const_mgr->GetConstant(type_mgr->GetType(inst->type_id()), {});
-      }
-
       if (i != inst->NumInOperands() - 1) {
         chain.push_back(composite);
       }
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/opt/eliminate_dead_io_components_pass.cpp b/third_party/vulkan-deps/spirv-tools/src/source/opt/eliminate_dead_input_components_pass.cpp
similarity index 89%
rename from third_party/vulkan-deps/spirv-tools/src/source/opt/eliminate_dead_io_components_pass.cpp
rename to third_party/vulkan-deps/spirv-tools/src/source/opt/eliminate_dead_input_components_pass.cpp
index df59645..fa019ac 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/opt/eliminate_dead_io_components_pass.cpp
+++ b/third_party/vulkan-deps/spirv-tools/src/source/opt/eliminate_dead_input_components_pass.cpp
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "source/opt/eliminate_dead_io_components_pass.h"
+#include "source/opt/eliminate_dead_input_components_pass.h"
 
 #include <set>
 #include <vector>
@@ -32,22 +32,10 @@
 constexpr uint32_t kConstantValueInIdx = 0;
 }  // namespace
 
-Pass::Status EliminateDeadIOComponentsPass::Process() {
-  // Only process input and output variables
-  if (elim_sclass_ != spv::StorageClass::Input &&
-      elim_sclass_ != spv::StorageClass::Output) {
-    if (consumer()) {
-      std::string message =
-          "EliminateDeadIOComponentsPass only valid for input and output "
-          "variables.";
-      consumer()(SPV_MSG_ERROR, 0, {0, 0, 0}, message.c_str());
-    }
-    return Status::Failure;
-  }
-  // If safe mode, only process Input variables in vertex shader
+Pass::Status EliminateDeadInputComponentsPass::Process() {
+  // Process non-vertex only if explicitly allowed.
   const auto stage = context()->GetStage();
-  if (safe_mode_ && !(stage == spv::ExecutionModel::Vertex &&
-                      elim_sclass_ == spv::StorageClass::Input))
+  if (stage != spv::ExecutionModel::Vertex && vertex_shader_only_)
     return Status::SuccessWithoutChange;
   // Current functionality assumes shader capability.
   if (!context()->get_feature_mgr()->HasCapability(spv::Capability::Shader))
@@ -74,8 +62,14 @@
       continue;
     }
     const auto sclass = ptr_type->storage_class();
-    if (sclass != elim_sclass_) {
-      continue;
+    if (output_instead_) {
+      if (sclass != spv::StorageClass::Output) {
+        continue;
+      }
+    } else {
+      if (sclass != spv::StorageClass::Input) {
+        continue;
+      }
     }
     // For tesc, or input variables in tese or geom shaders,
     // there is a outer per-vertex-array that must be ignored
@@ -143,7 +137,7 @@
   return modified ? Status::SuccessWithChange : Status::SuccessWithoutChange;
 }
 
-unsigned EliminateDeadIOComponentsPass::FindMaxIndex(
+unsigned EliminateDeadInputComponentsPass::FindMaxIndex(
     const Instruction& var, const unsigned original_max,
     const bool skip_first_index) {
   unsigned max = 0;
@@ -188,8 +182,8 @@
   return seen_non_const_ac ? original_max : max;
 }
 
-void EliminateDeadIOComponentsPass::ChangeArrayLength(Instruction& arr_var,
-                                                      unsigned length) {
+void EliminateDeadInputComponentsPass::ChangeArrayLength(Instruction& arr_var,
+                                                         unsigned length) {
   analysis::TypeManager* type_mgr = context()->get_type_mgr();
   analysis::ConstantManager* const_mgr = context()->get_constant_mgr();
   analysis::DefUseManager* def_use_mgr = context()->get_def_use_mgr();
@@ -208,8 +202,8 @@
   def_use_mgr->AnalyzeInstUse(&arr_var);
 }
 
-void EliminateDeadIOComponentsPass::ChangeIOVarStructLength(Instruction& io_var,
-                                                            unsigned length) {
+void EliminateDeadInputComponentsPass::ChangeIOVarStructLength(
+    Instruction& io_var, unsigned length) {
   analysis::TypeManager* type_mgr = context()->get_type_mgr();
   analysis::Pointer* ptr_type =
       type_mgr->GetType(io_var.type_id())->AsPointer();
@@ -241,7 +235,9 @@
     analysis::Array new_arr_ty(reg_new_var_ty, arr_type->length_info());
     reg_new_var_ty = type_mgr->GetRegisteredType(&new_arr_ty);
   }
-  analysis::Pointer new_ptr_ty(reg_new_var_ty, elim_sclass_);
+  auto sclass =
+      output_instead_ ? spv::StorageClass::Output : spv::StorageClass::Input;
+  analysis::Pointer new_ptr_ty(reg_new_var_ty, sclass);
   analysis::Type* reg_new_ptr_ty = type_mgr->GetRegisteredType(&new_ptr_ty);
   uint32_t new_ptr_ty_id = type_mgr->GetTypeInstruction(reg_new_ptr_ty);
   io_var.SetResultType(new_ptr_ty_id);
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/opt/eliminate_dead_io_components_pass.h b/third_party/vulkan-deps/spirv-tools/src/source/opt/eliminate_dead_input_components_pass.h
similarity index 81%
rename from third_party/vulkan-deps/spirv-tools/src/source/opt/eliminate_dead_io_components_pass.h
rename to third_party/vulkan-deps/spirv-tools/src/source/opt/eliminate_dead_input_components_pass.h
index ef4dfb7..bdfdc21 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/opt/eliminate_dead_io_components_pass.h
+++ b/third_party/vulkan-deps/spirv-tools/src/source/opt/eliminate_dead_input_components_pass.h
@@ -26,11 +26,12 @@
 namespace opt {
 
 // See optimizer.hpp for documentation.
-class EliminateDeadIOComponentsPass : public Pass {
+class EliminateDeadInputComponentsPass : public Pass {
  public:
-  explicit EliminateDeadIOComponentsPass(spv::StorageClass elim_sclass,
-                                         bool safe_mode = true)
-      : elim_sclass_(elim_sclass), safe_mode_(safe_mode) {}
+  explicit EliminateDeadInputComponentsPass(bool output_instead = false,
+                                            bool vertex_shader_only = true)
+      : output_instead_(output_instead),
+        vertex_shader_only_(vertex_shader_only) {}
 
   const char* name() const override {
     return "eliminate-dead-input-components";
@@ -61,12 +62,11 @@
   // is either the struct or a per-vertex-array of the struct.
   void ChangeIOVarStructLength(Instruction& io_var, unsigned length);
 
-  // Storage class to be optimized. Must be Input or Output.
-  spv::StorageClass elim_sclass_;
+  // Process output variables instead
+  bool output_instead_;
 
-  // Only make changes that will not cause interface incompatibility if done
-  // standalone. Currently this is only Input variables in vertex shaders.
-  bool safe_mode_;
+  // Only process vertex shaders
+  bool vertex_shader_only_;
 };
 
 }  // namespace opt
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/opt/ir_context.cpp b/third_party/vulkan-deps/spirv-tools/src/source/opt/ir_context.cpp
index 889a671..0a047e9 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/opt/ir_context.cpp
+++ b/third_party/vulkan-deps/spirv-tools/src/source/opt/ir_context.cpp
@@ -482,7 +482,6 @@
          (uint32_t)spv::Op::OpTypeAccelerationStructureNV,
          (uint32_t)spv::Op::OpTypeAccelerationStructureKHR,
          (uint32_t)spv::Op::OpTypeRayQueryKHR,
-         (uint32_t)spv::Op::OpTypeHitObjectNV,
          (uint32_t)spv::Op::OpTypeArray,
          (uint32_t)spv::Op::OpTypeRuntimeArray,
          (uint32_t)spv::Op::OpTypeStruct,
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/opt/optimizer.cpp b/third_party/vulkan-deps/spirv-tools/src/source/opt/optimizer.cpp
index be0daeb..4cf3292 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/opt/optimizer.cpp
+++ b/third_party/vulkan-deps/spirv-tools/src/source/opt/optimizer.cpp
@@ -785,10 +785,14 @@
       MakeUnique<opt::SSARewritePass>());
 }
 
-Optimizer::PassToken CreateAggressiveDCEPass(bool preserve_interface,
-                                             bool remove_outputs) {
+Optimizer::PassToken CreateAggressiveDCEPass() {
   return MakeUnique<Optimizer::PassToken::Impl>(
-      MakeUnique<opt::AggressiveDCEPass>(preserve_interface, remove_outputs));
+      MakeUnique<opt::AggressiveDCEPass>(false));
+}
+
+Optimizer::PassToken CreateAggressiveDCEPass(bool preserve_interface) {
+  return MakeUnique<Optimizer::PassToken::Impl>(
+      MakeUnique<opt::AggressiveDCEPass>(preserve_interface));
 }
 
 Optimizer::PassToken CreateRemoveUnusedInterfaceVariablesPass() {
@@ -1013,20 +1017,19 @@
 
 Optimizer::PassToken CreateEliminateDeadInputComponentsPass() {
   return MakeUnique<Optimizer::PassToken::Impl>(
-      MakeUnique<opt::EliminateDeadIOComponentsPass>(spv::StorageClass::Input,
-                                                     /* safe_mode */ false));
+      MakeUnique<opt::EliminateDeadInputComponentsPass>(
+          /* output_instead */ false, /* vertex_shader_only */ false));
 }
 
 Optimizer::PassToken CreateEliminateDeadOutputComponentsPass() {
   return MakeUnique<Optimizer::PassToken::Impl>(
-      MakeUnique<opt::EliminateDeadIOComponentsPass>(spv::StorageClass::Output,
-                                                     /* safe_mode */ false));
+      MakeUnique<opt::EliminateDeadInputComponentsPass>(
+          /* output_instead */ true, /* vertex_shader_only */ false));
 }
 
 Optimizer::PassToken CreateEliminateDeadInputComponentsSafePass() {
   return MakeUnique<Optimizer::PassToken::Impl>(
-      MakeUnique<opt::EliminateDeadIOComponentsPass>(spv::StorageClass::Input,
-                                                     /* safe_mode */ true));
+      MakeUnique<opt::EliminateDeadInputComponentsPass>());
 }
 
 Optimizer::PassToken CreateAnalyzeLiveInputPass(
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/opt/passes.h b/third_party/vulkan-deps/spirv-tools/src/source/opt/passes.h
index eb3b1e5..5344dcf 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/opt/passes.h
+++ b/third_party/vulkan-deps/spirv-tools/src/source/opt/passes.h
@@ -35,7 +35,7 @@
 #include "source/opt/desc_sroa.h"
 #include "source/opt/eliminate_dead_constant_pass.h"
 #include "source/opt/eliminate_dead_functions_pass.h"
-#include "source/opt/eliminate_dead_io_components_pass.h"
+#include "source/opt/eliminate_dead_input_components_pass.h"
 #include "source/opt/eliminate_dead_members_pass.h"
 #include "source/opt/eliminate_dead_output_stores_pass.h"
 #include "source/opt/empty_pass.h"
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/opt/reflect.h b/third_party/vulkan-deps/spirv-tools/src/source/opt/reflect.h
index 45bb5c5..1c34600 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/opt/reflect.h
+++ b/third_party/vulkan-deps/spirv-tools/src/source/opt/reflect.h
@@ -53,8 +53,7 @@
          opcode == spv::Op::OpTypeAccelerationStructureNV ||
          opcode == spv::Op::OpTypeAccelerationStructureKHR ||
          opcode == spv::Op::OpTypeRayQueryKHR ||
-         opcode == spv::Op::OpTypeCooperativeMatrixNV ||
-         opcode == spv::Op::OpTypeHitObjectNV;
+         opcode == spv::Op::OpTypeCooperativeMatrixNV;
 }
 inline bool IsConstantInst(spv::Op opcode) {
   return (opcode >= spv::Op::OpConstantTrue &&
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/opt/type_manager.cpp b/third_party/vulkan-deps/spirv-tools/src/source/opt/type_manager.cpp
index 6e4c054..7dc9c8f 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/opt/type_manager.cpp
+++ b/third_party/vulkan-deps/spirv-tools/src/source/opt/type_manager.cpp
@@ -234,7 +234,6 @@
     DefineParameterlessCase(NamedBarrier);
     DefineParameterlessCase(AccelerationStructureNV);
     DefineParameterlessCase(RayQueryKHR);
-    DefineParameterlessCase(HitObjectNV);
 #undef DefineParameterlessCase
     case Type::kInteger:
       typeInst = MakeUnique<Instruction>(
@@ -528,7 +527,6 @@
     DefineNoSubtypeCase(NamedBarrier);
     DefineNoSubtypeCase(AccelerationStructureNV);
     DefineNoSubtypeCase(RayQueryKHR);
-    DefineNoSubtypeCase(HitObjectNV);
 #undef DefineNoSubtypeCase
     case Type::kVector: {
       const Vector* vec_ty = type.AsVector();
@@ -866,9 +864,6 @@
     case spv::Op::OpTypeRayQueryKHR:
       type = new RayQueryKHR();
       break;
-    case spv::Op::OpTypeHitObjectNV:
-      type = new HitObjectNV();
-      break;
     default:
       SPIRV_UNIMPLEMENTED(consumer_, "unhandled type");
       break;
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/opt/types.cpp b/third_party/vulkan-deps/spirv-tools/src/source/opt/types.cpp
index ab95906..12ff139 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/opt/types.cpp
+++ b/third_party/vulkan-deps/spirv-tools/src/source/opt/types.cpp
@@ -131,7 +131,6 @@
     DeclareKindCase(AccelerationStructureNV);
     DeclareKindCase(CooperativeMatrixNV);
     DeclareKindCase(RayQueryKHR);
-    DeclareKindCase(HitObjectNV);
 #undef DeclareKindCase
     default:
       assert(false && "Unhandled type");
@@ -178,7 +177,6 @@
     DeclareKindCase(AccelerationStructureNV);
     DeclareKindCase(CooperativeMatrixNV);
     DeclareKindCase(RayQueryKHR);
-    DeclareKindCase(HitObjectNV);
 #undef DeclareKindCase
     default:
       assert(false && "Unhandled type");
@@ -233,7 +231,6 @@
     DeclareKindCase(AccelerationStructureNV);
     DeclareKindCase(CooperativeMatrixNV);
     DeclareKindCase(RayQueryKHR);
-    DeclareKindCase(HitObjectNV);
 #undef DeclareKindCase
     default:
       assert(false && "Unhandled type");
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/opt/types.h b/third_party/vulkan-deps/spirv-tools/src/source/opt/types.h
index 1f32937..645dbd4 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/opt/types.h
+++ b/third_party/vulkan-deps/spirv-tools/src/source/opt/types.h
@@ -61,7 +61,6 @@
 class AccelerationStructureNV;
 class CooperativeMatrixNV;
 class RayQueryKHR;
-class HitObjectNV;
 
 // Abstract class for a SPIR-V type. It has a bunch of As<sublcass>() methods,
 // which is used as a way to probe the actual <subclass>.
@@ -101,7 +100,6 @@
     kAccelerationStructureNV,
     kCooperativeMatrixNV,
     kRayQueryKHR,
-    kHitObjectNV,
     kLast
   };
 
@@ -198,7 +196,6 @@
   DeclareCastMethod(AccelerationStructureNV)
   DeclareCastMethod(CooperativeMatrixNV)
   DeclareCastMethod(RayQueryKHR)
-  DeclareCastMethod(HitObjectNV)
 #undef DeclareCastMethod
 
 protected:
@@ -651,7 +648,6 @@
 DefineParameterlessType(NamedBarrier, named_barrier);
 DefineParameterlessType(AccelerationStructureNV, accelerationStructureNV);
 DefineParameterlessType(RayQueryKHR, rayQueryKHR);
-DefineParameterlessType(HitObjectNV, hitObjectNV);
 #undef DefineParameterlessType
 
 }  // namespace analysis
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/val/validate.cpp b/third_party/vulkan-deps/spirv-tools/src/source/val/validate.cpp
index 52cb0d8..10f3d43 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/val/validate.cpp
+++ b/third_party/vulkan-deps/spirv-tools/src/source/val/validate.cpp
@@ -365,7 +365,6 @@
     if (auto error = LiteralsPass(*vstate, &instruction)) return error;
     if (auto error = RayQueryPass(*vstate, &instruction)) return error;
     if (auto error = RayTracingPass(*vstate, &instruction)) return error;
-    if (auto error = RayReorderNVPass(*vstate, &instruction)) return error;
     if (auto error = MeshShadingPass(*vstate, &instruction)) return error;
   }
 
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/val/validate.h b/third_party/vulkan-deps/spirv-tools/src/source/val/validate.h
index 8987438..fd84b06 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/val/validate.h
+++ b/third_party/vulkan-deps/spirv-tools/src/source/val/validate.h
@@ -203,9 +203,6 @@
 /// Validates correctness of ray tracing instructions.
 spv_result_t RayTracingPass(ValidationState_t& _, const Instruction* inst);
 
-/// Validates correctness of shader execution reorder instructions.
-spv_result_t RayReorderNVPass(ValidationState_t& _, const Instruction* inst);
-
 /// Validates correctness of mesh shading instructions.
 spv_result_t MeshShadingPass(ValidationState_t& _, const Instruction* inst);
 
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/val/validate_annotation.cpp b/third_party/vulkan-deps/spirv-tools/src/source/val/validate_annotation.cpp
index bef753d..2d13456 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/val/validate_annotation.cpp
+++ b/third_party/vulkan-deps/spirv-tools/src/source/val/validate_annotation.cpp
@@ -200,8 +200,7 @@
             sc != spv::StorageClass::HitAttributeKHR &&
             sc != spv::StorageClass::CallableDataKHR &&
             sc != spv::StorageClass::IncomingCallableDataKHR &&
-            sc != spv::StorageClass::ShaderRecordBufferKHR &&
-            sc != spv::StorageClass::HitObjectAttributeNV) {
+            sc != spv::StorageClass::ShaderRecordBufferKHR) {
           return _.diag(SPV_ERROR_INVALID_ID, target)
                  << _.VkErrorID(6672) << _.SpvDecorationString(dec)
                  << " decoration must not be applied to this storage class";
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/val/validate_extensions.cpp b/third_party/vulkan-deps/spirv-tools/src/source/val/validate_extensions.cpp
index ebb13cf..98c691b 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/val/validate_extensions.cpp
+++ b/third_party/vulkan-deps/spirv-tools/src/source/val/validate_extensions.cpp
@@ -757,8 +757,7 @@
     std::string extension = GetExtensionString(&(inst->c_inst()));
     if (extension ==
             ExtensionToString(kSPV_KHR_workgroup_memory_explicit_layout) ||
-        extension == ExtensionToString(kSPV_EXT_mesh_shader) ||
-        extension == ExtensionToString(kSPV_NV_shader_invocation_reorder)) {
+        extension == ExtensionToString(kSPV_EXT_mesh_shader)) {
       return _.diag(SPV_ERROR_WRONG_VERSION, inst)
              << extension << " extension requires SPIR-V version 1.4 or later.";
     }
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/val/validate_interfaces.cpp b/third_party/vulkan-deps/spirv-tools/src/source/val/validate_interfaces.cpp
index 00a5999..54152da 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/val/validate_interfaces.cpp
+++ b/third_party/vulkan-deps/spirv-tools/src/source/val/validate_interfaces.cpp
@@ -537,6 +537,64 @@
   return SPV_SUCCESS;
 }
 
+spv_result_t ValidateStorageClass(ValidationState_t& _,
+                                  const Instruction* entry_point) {
+  bool has_push_constant = false;
+  bool has_ray_payload = false;
+  bool has_hit_attribute = false;
+  bool has_callable_data = false;
+  for (uint32_t i = 3; i < entry_point->operands().size(); ++i) {
+    auto interface_id = entry_point->GetOperandAs<uint32_t>(i);
+    auto interface_var = _.FindDef(interface_id);
+    auto storage_class = interface_var->GetOperandAs<spv::StorageClass>(2);
+    switch (storage_class) {
+      case spv::StorageClass::PushConstant: {
+        if (has_push_constant) {
+          return _.diag(SPV_ERROR_INVALID_DATA, entry_point)
+                 << _.VkErrorID(6673)
+                 << "Entry-point has more than one variable with the "
+                    "PushConstant storage class in the interface";
+        }
+        has_push_constant = true;
+        break;
+      }
+      case spv::StorageClass::IncomingRayPayloadKHR: {
+        if (has_ray_payload) {
+          return _.diag(SPV_ERROR_INVALID_DATA, entry_point)
+                 << _.VkErrorID(4700)
+                 << "Entry-point has more than one variable with the "
+                    "IncomingRayPayloadKHR storage class in the interface";
+        }
+        has_ray_payload = true;
+        break;
+      }
+      case spv::StorageClass::HitAttributeKHR: {
+        if (has_hit_attribute) {
+          return _.diag(SPV_ERROR_INVALID_DATA, entry_point)
+                 << _.VkErrorID(4702)
+                 << "Entry-point has more than one variable with the "
+                    "HitAttributeKHR storage class in the interface";
+        }
+        has_hit_attribute = true;
+        break;
+      }
+      case spv::StorageClass::IncomingCallableDataKHR: {
+        if (has_callable_data) {
+          return _.diag(SPV_ERROR_INVALID_DATA, entry_point)
+                 << _.VkErrorID(4706)
+                 << "Entry-point has more than one variable with the "
+                    "IncomingCallableDataKHR storage class in the interface";
+        }
+        has_callable_data = true;
+        break;
+      }
+      default:
+        break;
+    }
+  }
+  return SPV_SUCCESS;
+}
+
 }  // namespace
 
 spv_result_t ValidateInterfaces(ValidationState_t& _) {
@@ -555,6 +613,9 @@
         if (auto error = ValidateLocations(_, &inst)) {
           return error;
         }
+        if (auto error = ValidateStorageClass(_, &inst)) {
+          return error;
+        }
       }
       if (inst.opcode() == spv::Op::OpTypeVoid) break;
     }
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/val/validate_memory.cpp b/third_party/vulkan-deps/spirv-tools/src/source/val/validate_memory.cpp
index 57fd23d..80c9e87 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/val/validate_memory.cpp
+++ b/third_party/vulkan-deps/spirv-tools/src/source/val/validate_memory.cpp
@@ -447,8 +447,7 @@
       storage_class != spv::StorageClass::HitAttributeKHR &&
       storage_class != spv::StorageClass::CallableDataKHR &&
       storage_class != spv::StorageClass::IncomingCallableDataKHR &&
-      storage_class != spv::StorageClass::TaskPayloadWorkgroupEXT &&
-      storage_class != spv::StorageClass::HitObjectAttributeNV) {
+      storage_class != spv::StorageClass::TaskPayloadWorkgroupEXT) {
     bool storage_input_or_output = storage_class == spv::StorageClass::Input ||
                                    storage_class == spv::StorageClass::Output;
     bool builtin = false;
@@ -657,11 +656,6 @@
              << "OpVariable, <id> " << _.getIdName(inst->id())
              << ", initializer are not allowed for Input";
     }
-    if (storage_class == spv::StorageClass::HitObjectAttributeNV) {
-      return _.diag(SPV_ERROR_INVALID_ID, inst)
-             << "OpVariable, <id> " << _.getIdName(inst->id())
-             << ", initializer are not allowed for HitObjectAttributeNV";
-    }
   }
 
   if (storage_class == spv::StorageClass::PhysicalStorageBuffer) {
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/val/validate_ray_tracing_reorder.cpp b/third_party/vulkan-deps/spirv-tools/src/source/val/validate_ray_tracing_reorder.cpp
deleted file mode 100644
index cb190f9..0000000
--- a/third_party/vulkan-deps/spirv-tools/src/source/val/validate_ray_tracing_reorder.cpp
+++ /dev/null
@@ -1,625 +0,0 @@
-// Copyright (c) 2022 The Khronos Group 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.
-
-// Validates ray tracing instructions from SPV_NV_shader_execution_reorder
-
-#include "source/opcode.h"
-#include "source/val/instruction.h"
-#include "source/val/validate.h"
-#include "source/val/validation_state.h"
-
-#include <limits>
-
-namespace spvtools {
-namespace val {
-
-static const uint32_t KRayParamInvalidId = std::numeric_limits<uint32_t>::max();
-
-spv_result_t ValidateHitObjectPointer(ValidationState_t& _,
-                                      const Instruction* inst,
-                                      uint32_t hit_object_index) {
-  const uint32_t hit_object_id = inst->GetOperandAs<uint32_t>(hit_object_index);
-  auto variable = _.FindDef(hit_object_id);
-  const auto var_opcode = variable->opcode();
-  if (!variable || (var_opcode != spv::Op::OpVariable &&
-                    var_opcode != spv::Op::OpFunctionParameter &&
-                    var_opcode != spv::Op::OpAccessChain)) {
-    return _.diag(SPV_ERROR_INVALID_DATA, inst)
-           << "Hit Object must be a memory object declaration";
-  }
-  auto pointer = _.FindDef(variable->GetOperandAs<uint32_t>(0));
-  if (!pointer || pointer->opcode() != spv::Op::OpTypePointer) {
-    return _.diag(SPV_ERROR_INVALID_DATA, inst)
-           << "Hit Object must be a pointer";
-  }
-  auto type = _.FindDef(pointer->GetOperandAs<uint32_t>(2));
-  if (!type || type->opcode() != spv::Op::OpTypeHitObjectNV) {
-    return _.diag(SPV_ERROR_INVALID_DATA, inst)
-           << "Type must be OpTypeHitObjectNV";
-  }
-  return SPV_SUCCESS;
-}
-
-spv_result_t ValidateHitObjectInstructionCommonParameters(
-    ValidationState_t& _, const Instruction* inst,
-    uint32_t acceleration_struct_index, uint32_t instance_id_index,
-    uint32_t primtive_id_index, uint32_t geometry_index,
-    uint32_t ray_flags_index, uint32_t cull_mask_index, uint32_t hit_kind_index,
-    uint32_t sbt_index, uint32_t sbt_offset_index, uint32_t sbt_stride_index,
-    uint32_t sbt_record_offset_index, uint32_t sbt_record_stride_index,
-    uint32_t miss_index, uint32_t ray_origin_index, uint32_t ray_tmin_index,
-    uint32_t ray_direction_index, uint32_t ray_tmax_index,
-    uint32_t payload_index, uint32_t hit_object_attr_index) {
-  auto isValidId = [](uint32_t spvid) { return spvid < KRayParamInvalidId; };
-  if (isValidId(acceleration_struct_index) &&
-      _.GetIdOpcode(_.GetOperandTypeId(inst, acceleration_struct_index)) !=
-          spv::Op::OpTypeAccelerationStructureKHR) {
-    return _.diag(SPV_ERROR_INVALID_DATA, inst)
-           << "Expected Acceleration Structure to be of type "
-              "OpTypeAccelerationStructureKHR";
-  }
-
-  if (isValidId(instance_id_index)) {
-    const uint32_t instance_id = _.GetOperandTypeId(inst, instance_id_index);
-    if (!_.IsIntScalarType(instance_id) || _.GetBitWidth(instance_id) != 32) {
-      return _.diag(SPV_ERROR_INVALID_DATA, inst)
-             << "Instance Id must be a 32-bit int scalar";
-    }
-  }
-
-  if (isValidId(primtive_id_index)) {
-    const uint32_t primitive_id = _.GetOperandTypeId(inst, primtive_id_index);
-    if (!_.IsIntScalarType(primitive_id) || _.GetBitWidth(primitive_id) != 32) {
-      return _.diag(SPV_ERROR_INVALID_DATA, inst)
-             << "Primitive Id must be a 32-bit int scalar";
-    }
-  }
-
-  if (isValidId(geometry_index)) {
-    const uint32_t geometry_index_id = _.GetOperandTypeId(inst, geometry_index);
-    if (!_.IsIntScalarType(geometry_index_id) ||
-        _.GetBitWidth(geometry_index_id) != 32) {
-      return _.diag(SPV_ERROR_INVALID_DATA, inst)
-             << "Geometry Index must be a 32-bit int scalar";
-    }
-  }
-
-  if (isValidId(miss_index)) {
-    const uint32_t miss_index_id = _.GetOperandTypeId(inst, miss_index);
-    if (!_.IsUnsignedIntScalarType(miss_index_id) ||
-        _.GetBitWidth(miss_index_id) != 32) {
-      return _.diag(SPV_ERROR_INVALID_DATA, inst)
-             << "Miss Index must be a 32-bit int scalar";
-    }
-  }
-
-  if (isValidId(cull_mask_index)) {
-    const uint32_t cull_mask_id = _.GetOperandTypeId(inst, cull_mask_index);
-    if (!_.IsUnsignedIntScalarType(cull_mask_id) ||
-        _.GetBitWidth(cull_mask_id) != 32) {
-      return _.diag(SPV_ERROR_INVALID_DATA, inst)
-             << "Cull mask must be a 32-bit int scalar";
-    }
-  }
-
-  if (isValidId(sbt_index)) {
-    const uint32_t sbt_index_id = _.GetOperandTypeId(inst, sbt_index);
-    if (!_.IsUnsignedIntScalarType(sbt_index_id) ||
-        _.GetBitWidth(sbt_index_id) != 32) {
-      return _.diag(SPV_ERROR_INVALID_DATA, inst)
-             << "SBT Index must be a 32-bit unsigned int scalar";
-    }
-  }
-
-  if (isValidId(sbt_offset_index)) {
-    const uint32_t sbt_offset_id = _.GetOperandTypeId(inst, sbt_offset_index);
-    if (!_.IsUnsignedIntScalarType(sbt_offset_id) ||
-        _.GetBitWidth(sbt_offset_id) != 32) {
-      return _.diag(SPV_ERROR_INVALID_DATA, inst)
-             << "SBT Offset must be a 32-bit unsigned int scalar";
-    }
-  }
-
-  if (isValidId(sbt_stride_index)) {
-    const uint32_t sbt_stride_index_id =
-        _.GetOperandTypeId(inst, sbt_stride_index);
-    if (!_.IsUnsignedIntScalarType(sbt_stride_index_id) ||
-        _.GetBitWidth(sbt_stride_index_id) != 32) {
-      return _.diag(SPV_ERROR_INVALID_DATA, inst)
-             << "SBT Stride must be a 32-bit unsigned int scalar";
-    }
-  }
-
-  if (isValidId(sbt_record_offset_index)) {
-    const uint32_t sbt_record_offset_index_id =
-        _.GetOperandTypeId(inst, sbt_record_offset_index);
-    if (!_.IsUnsignedIntScalarType(sbt_record_offset_index_id) ||
-        _.GetBitWidth(sbt_record_offset_index_id) != 32) {
-      return _.diag(SPV_ERROR_INVALID_DATA, inst)
-             << "SBT record offset must be a 32-bit unsigned int scalar";
-    }
-  }
-
-  if (isValidId(sbt_record_stride_index)) {
-    const uint32_t sbt_record_stride_index_id =
-        _.GetOperandTypeId(inst, sbt_record_stride_index);
-    if (!_.IsUnsignedIntScalarType(sbt_record_stride_index_id) ||
-        _.GetBitWidth(sbt_record_stride_index_id) != 32) {
-      return _.diag(SPV_ERROR_INVALID_DATA, inst)
-             << "SBT record stride must be a 32-bit unsigned int scalar";
-    }
-  }
-
-  if (isValidId(ray_origin_index)) {
-    const uint32_t ray_origin_id = _.GetOperandTypeId(inst, ray_origin_index);
-    if (!_.IsFloatVectorType(ray_origin_id) ||
-        _.GetDimension(ray_origin_id) != 3 ||
-        _.GetBitWidth(ray_origin_id) != 32) {
-      return _.diag(SPV_ERROR_INVALID_DATA, inst)
-             << "Ray Origin must be a 32-bit float 3-component vector";
-    }
-  }
-
-  if (isValidId(ray_tmin_index)) {
-    const uint32_t ray_tmin_id = _.GetOperandTypeId(inst, ray_tmin_index);
-    if (!_.IsFloatScalarType(ray_tmin_id) || _.GetBitWidth(ray_tmin_id) != 32) {
-      return _.diag(SPV_ERROR_INVALID_DATA, inst)
-             << "Ray TMin must be a 32-bit float scalar";
-    }
-  }
-
-  if (isValidId(ray_direction_index)) {
-    const uint32_t ray_direction_id =
-        _.GetOperandTypeId(inst, ray_direction_index);
-    if (!_.IsFloatVectorType(ray_direction_id) ||
-        _.GetDimension(ray_direction_id) != 3 ||
-        _.GetBitWidth(ray_direction_id) != 32) {
-      return _.diag(SPV_ERROR_INVALID_DATA, inst)
-             << "Ray Direction must be a 32-bit float 3-component vector";
-    }
-  }
-
-  if (isValidId(ray_tmax_index)) {
-    const uint32_t ray_tmax_id = _.GetOperandTypeId(inst, ray_tmax_index);
-    if (!_.IsFloatScalarType(ray_tmax_id) || _.GetBitWidth(ray_tmax_id) != 32) {
-      return _.diag(SPV_ERROR_INVALID_DATA, inst)
-             << "Ray TMax must be a 32-bit float scalar";
-    }
-  }
-
-  if (isValidId(ray_flags_index)) {
-    const uint32_t ray_flags_id = _.GetOperandTypeId(inst, ray_flags_index);
-    if (!_.IsIntScalarType(ray_flags_id) || _.GetBitWidth(ray_flags_id) != 32) {
-      return _.diag(SPV_ERROR_INVALID_DATA, inst)
-             << "Ray Flags must be a 32-bit int scalar";
-    }
-  }
-
-  if (isValidId(payload_index)) {
-    const uint32_t payload_id = inst->GetOperandAs<uint32_t>(payload_index);
-    auto variable = _.FindDef(payload_id);
-    const auto var_opcode = variable->opcode();
-    if (!variable || var_opcode != spv::Op::OpVariable ||
-        (variable->GetOperandAs<spv::StorageClass>(2) !=
-             spv::StorageClass::RayPayloadKHR &&
-         variable->GetOperandAs<spv::StorageClass>(2) !=
-             spv::StorageClass::IncomingRayPayloadKHR)) {
-      return _.diag(SPV_ERROR_INVALID_DATA, inst)
-             << "payload must be a OpVariable of storage "
-                "class RayPayloadKHR or IncomingRayPayloadKHR";
-    }
-  }
-
-  if (isValidId(hit_kind_index)) {
-    const uint32_t hit_kind_id = _.GetOperandTypeId(inst, hit_kind_index);
-    if (!_.IsUnsignedIntScalarType(hit_kind_id) ||
-        _.GetBitWidth(hit_kind_id) != 32) {
-      return _.diag(SPV_ERROR_INVALID_DATA, inst)
-             << "Hit Kind must be a 32-bit unsigned int scalar";
-    }
-  }
-
-  if (isValidId(hit_object_attr_index)) {
-    const uint32_t hit_object_attr_id =
-        inst->GetOperandAs<uint32_t>(hit_object_attr_index);
-    auto variable = _.FindDef(hit_object_attr_id);
-    const auto var_opcode = variable->opcode();
-    if (!variable || var_opcode != spv::Op::OpVariable ||
-        (variable->GetOperandAs<spv::StorageClass>(2)) !=
-            spv::StorageClass::HitObjectAttributeNV) {
-      return _.diag(SPV_ERROR_INVALID_DATA, inst)
-             << "Hit Object Attributes id must be a OpVariable of storage "
-                "class HitObjectAttributeNV";
-    }
-  }
-
-  return SPV_SUCCESS;
-}
-
-spv_result_t RayReorderNVPass(ValidationState_t& _, const Instruction* inst) {
-  const spv::Op opcode = inst->opcode();
-  const uint32_t result_type = inst->type_id();
-
-  auto RegisterOpcodeForValidModel = [](ValidationState_t& vs,
-                                        const Instruction* rtinst) {
-    std::string opcode_name = spvOpcodeString(rtinst->opcode());
-    vs.function(rtinst->function()->id())
-        ->RegisterExecutionModelLimitation(
-            [opcode_name](spv::ExecutionModel model, std::string* message) {
-              if (model != spv::ExecutionModel::RayGenerationKHR &&
-                  model != spv::ExecutionModel::ClosestHitKHR &&
-                  model != spv::ExecutionModel::MissKHR) {
-                if (message) {
-                  *message = opcode_name +
-                             " requires RayGenerationKHR, ClosestHitKHR and "
-                             "MissKHR execution models";
-                }
-                return false;
-              }
-              return true;
-            });
-    return;
-  };
-
-  switch (opcode) {
-    case spv::Op::OpHitObjectIsMissNV:
-    case spv::Op::OpHitObjectIsHitNV:
-    case spv::Op::OpHitObjectIsEmptyNV: {
-      RegisterOpcodeForValidModel(_, inst);
-      if (!_.IsBoolScalarType(result_type)) {
-        return _.diag(SPV_ERROR_INVALID_DATA, inst)
-               << "expected Result Type to be bool scalar type";
-      }
-
-      if (auto error = ValidateHitObjectPointer(_, inst, 2)) return error;
-      break;
-    }
-
-    case spv::Op::OpHitObjectGetShaderRecordBufferHandleNV: {
-      RegisterOpcodeForValidModel(_, inst);
-      if (auto error = ValidateHitObjectPointer(_, inst, 2)) return error;
-
-      if (!_.IsIntVectorType(result_type) ||
-          (_.GetDimension(result_type) != 2) ||
-          (_.GetBitWidth(result_type) != 32))
-        return _.diag(SPV_ERROR_INVALID_DATA, inst)
-               << "Expected 32-bit integer type 2-component vector as Result "
-                  "Type: "
-               << spvOpcodeString(opcode);
-      break;
-    }
-
-    case spv::Op::OpHitObjectGetHitKindNV:
-    case spv::Op::OpHitObjectGetPrimitiveIndexNV:
-    case spv::Op::OpHitObjectGetGeometryIndexNV:
-    case spv::Op::OpHitObjectGetInstanceIdNV:
-    case spv::Op::OpHitObjectGetInstanceCustomIndexNV:
-    case spv::Op::OpHitObjectGetShaderBindingTableRecordIndexNV: {
-      RegisterOpcodeForValidModel(_, inst);
-      if (auto error = ValidateHitObjectPointer(_, inst, 2)) return error;
-
-      if (!_.IsIntScalarType(result_type) || !_.GetBitWidth(result_type))
-        return _.diag(SPV_ERROR_INVALID_DATA, inst)
-               << "Expected 32-bit integer type scalar as Result Type: "
-               << spvOpcodeString(opcode);
-      break;
-    }
-
-    case spv::Op::OpHitObjectGetCurrentTimeNV:
-    case spv::Op::OpHitObjectGetRayTMaxNV:
-    case spv::Op::OpHitObjectGetRayTMinNV: {
-      RegisterOpcodeForValidModel(_, inst);
-      if (auto error = ValidateHitObjectPointer(_, inst, 2)) return error;
-
-      if (!_.IsFloatScalarType(result_type) || _.GetBitWidth(result_type) != 32)
-        return _.diag(SPV_ERROR_INVALID_DATA, inst)
-               << "Expected 32-bit floating-point type scalar as Result Type: "
-               << spvOpcodeString(opcode);
-      break;
-    }
-
-    case spv::Op::OpHitObjectGetObjectToWorldNV:
-    case spv::Op::OpHitObjectGetWorldToObjectNV: {
-      RegisterOpcodeForValidModel(_, inst);
-      if (auto error = ValidateHitObjectPointer(_, inst, 2)) return error;
-
-      uint32_t num_rows = 0;
-      uint32_t num_cols = 0;
-      uint32_t col_type = 0;
-      uint32_t component_type = 0;
-
-      if (!_.GetMatrixTypeInfo(result_type, &num_rows, &num_cols, &col_type,
-                               &component_type)) {
-        return _.diag(SPV_ERROR_INVALID_DATA, inst)
-               << "expected matrix type as Result Type: "
-               << spvOpcodeString(opcode);
-      }
-
-      if (num_cols != 4) {
-        return _.diag(SPV_ERROR_INVALID_DATA, inst)
-               << "expected Result Type matrix to have a Column Count of 4"
-               << spvOpcodeString(opcode);
-      }
-
-      if (!_.IsFloatScalarType(component_type) ||
-          _.GetBitWidth(result_type) != 32 || num_rows != 3) {
-        return _.diag(SPV_ERROR_INVALID_DATA, inst)
-               << "expected Result Type matrix to have a Column Type of "
-                  "3-component 32-bit float vectors: "
-               << spvOpcodeString(opcode);
-      }
-      break;
-    }
-
-    case spv::Op::OpHitObjectGetObjectRayOriginNV:
-    case spv::Op::OpHitObjectGetObjectRayDirectionNV:
-    case spv::Op::OpHitObjectGetWorldRayDirectionNV:
-    case spv::Op::OpHitObjectGetWorldRayOriginNV: {
-      RegisterOpcodeForValidModel(_, inst);
-      if (auto error = ValidateHitObjectPointer(_, inst, 2)) return error;
-
-      if (!_.IsFloatVectorType(result_type) ||
-          (_.GetDimension(result_type) != 3) ||
-          (_.GetBitWidth(result_type) != 32))
-        return _.diag(SPV_ERROR_INVALID_DATA, inst)
-               << "Expected 32-bit floating-point type 3-component vector as "
-                  "Result Type: "
-               << spvOpcodeString(opcode);
-      break;
-    }
-
-    case spv::Op::OpHitObjectGetAttributesNV: {
-      RegisterOpcodeForValidModel(_, inst);
-      if (auto error = ValidateHitObjectPointer(_, inst, 0)) return error;
-
-      const uint32_t hit_object_attr_id = inst->GetOperandAs<uint32_t>(1);
-      auto variable = _.FindDef(hit_object_attr_id);
-      const auto var_opcode = variable->opcode();
-      if (!variable || var_opcode != spv::Op::OpVariable ||
-          variable->GetOperandAs<spv::StorageClass>(2) !=
-              spv::StorageClass::HitObjectAttributeNV) {
-        return _.diag(SPV_ERROR_INVALID_DATA, inst)
-               << "Hit Object Attributes id must be a OpVariable of storage "
-                  "class HitObjectAttributeNV";
-      }
-      break;
-    }
-
-    case spv::Op::OpHitObjectExecuteShaderNV: {
-      RegisterOpcodeForValidModel(_, inst);
-      if (auto error = ValidateHitObjectPointer(_, inst, 0)) return error;
-
-      const uint32_t hit_object_attr_id = inst->GetOperandAs<uint32_t>(1);
-      auto variable = _.FindDef(hit_object_attr_id);
-      const auto var_opcode = variable->opcode();
-      if (!variable || var_opcode != spv::Op::OpVariable ||
-          (variable->GetOperandAs<spv::StorageClass>(2)) !=
-              spv::StorageClass::RayPayloadKHR) {
-        return _.diag(SPV_ERROR_INVALID_DATA, inst)
-               << "Hit Object Attributes id must be a OpVariable of storage "
-                  "class RayPayloadKHR";
-      }
-      break;
-    }
-
-    case spv::Op::OpHitObjectRecordEmptyNV: {
-      RegisterOpcodeForValidModel(_, inst);
-      if (auto error = ValidateHitObjectPointer(_, inst, 0)) return error;
-      break;
-    }
-
-    case spv::Op::OpHitObjectRecordMissNV: {
-      RegisterOpcodeForValidModel(_, inst);
-      if (auto error = ValidateHitObjectPointer(_, inst, 0)) return error;
-
-      const uint32_t miss_index = _.GetOperandTypeId(inst, 1);
-      if (!_.IsUnsignedIntScalarType(miss_index) ||
-          _.GetBitWidth(miss_index) != 32) {
-        return _.diag(SPV_ERROR_INVALID_DATA, inst)
-               << "Miss Index must be a 32-bit int scalar";
-      }
-
-      const uint32_t ray_origin = _.GetOperandTypeId(inst, 2);
-      if (!_.IsFloatVectorType(ray_origin) || _.GetDimension(ray_origin) != 3 ||
-          _.GetBitWidth(ray_origin) != 32) {
-        return _.diag(SPV_ERROR_INVALID_DATA, inst)
-               << "Ray Origin must be a 32-bit float 3-component vector";
-      }
-
-      const uint32_t ray_tmin = _.GetOperandTypeId(inst, 3);
-      if (!_.IsFloatScalarType(ray_tmin) || _.GetBitWidth(ray_tmin) != 32) {
-        return _.diag(SPV_ERROR_INVALID_DATA, inst)
-               << "Ray TMin must be a 32-bit float scalar";
-      }
-
-      const uint32_t ray_direction = _.GetOperandTypeId(inst, 4);
-      if (!_.IsFloatVectorType(ray_direction) ||
-          _.GetDimension(ray_direction) != 3 ||
-          _.GetBitWidth(ray_direction) != 32) {
-        return _.diag(SPV_ERROR_INVALID_DATA, inst)
-               << "Ray Direction must be a 32-bit float 3-component vector";
-      }
-
-      const uint32_t ray_tmax = _.GetOperandTypeId(inst, 5);
-      if (!_.IsFloatScalarType(ray_tmax) || _.GetBitWidth(ray_tmax) != 32) {
-        return _.diag(SPV_ERROR_INVALID_DATA, inst)
-               << "Ray TMax must be a 32-bit float scalar";
-      }
-      break;
-    }
-
-    case spv::Op::OpHitObjectRecordHitWithIndexNV: {
-      RegisterOpcodeForValidModel(_, inst);
-      if (auto error = ValidateHitObjectPointer(_, inst, 0)) return error;
-
-      if (auto error = ValidateHitObjectInstructionCommonParameters(
-              _, inst, 1 /* Acceleration Struct */, 2 /* Instance Id */,
-              3 /* Primtive Id */, 4 /* Geometry Index */,
-              KRayParamInvalidId /* Ray Flags */,
-              KRayParamInvalidId /* Cull Mask */, 5 /* Hit Kind*/,
-              6 /* SBT index */, KRayParamInvalidId /* SBT Offset */,
-              KRayParamInvalidId /* SBT Stride */,
-              KRayParamInvalidId /* SBT Record Offset */,
-              KRayParamInvalidId /* SBT Record Stride */,
-              KRayParamInvalidId /* Miss Index */, 7 /* Ray Origin */,
-              8 /* Ray TMin */, 9 /* Ray Direction */, 10 /* Ray TMax */,
-              KRayParamInvalidId /* Payload */, 11 /* Hit Object Attribute */))
-        return error;
-
-      break;
-    }
-
-    case spv::Op::OpHitObjectRecordHitNV: {
-      RegisterOpcodeForValidModel(_, inst);
-      if (auto error = ValidateHitObjectPointer(_, inst, 0)) return error;
-
-      if (auto error = ValidateHitObjectInstructionCommonParameters(
-              _, inst, 1 /* Acceleration Struct */, 2 /* Instance Id */,
-              3 /* Primtive Id */, 4 /* Geometry Index */,
-              KRayParamInvalidId /* Ray Flags */,
-              KRayParamInvalidId /* Cull Mask */, 5 /* Hit Kind*/,
-              KRayParamInvalidId /* SBT index */,
-              KRayParamInvalidId /* SBT Offset */,
-              KRayParamInvalidId /* SBT Stride */, 6 /* SBT Record Offset */,
-              7 /* SBT Record Stride */, KRayParamInvalidId /* Miss Index */,
-              8 /* Ray Origin */, 9 /* Ray TMin */, 10 /* Ray Direction */,
-              11 /* Ray TMax */, KRayParamInvalidId /* Payload */,
-              12 /* Hit Object Attribute */))
-        return error;
-
-      break;
-    }
-
-    case spv::Op::OpHitObjectTraceRayMotionNV: {
-      RegisterOpcodeForValidModel(_, inst);
-      if (auto error = ValidateHitObjectPointer(_, inst, 0)) return error;
-
-      if (auto error = ValidateHitObjectInstructionCommonParameters(
-              _, inst, 1 /* Acceleration Struct */,
-              KRayParamInvalidId /* Instance Id */,
-              KRayParamInvalidId /* Primtive Id */,
-              KRayParamInvalidId /* Geometry Index */, 2 /* Ray Flags */,
-              3 /* Cull Mask */, KRayParamInvalidId /* Hit Kind*/,
-              KRayParamInvalidId /* SBT index */, 4 /* SBT Offset */,
-              5 /* SBT Stride */, KRayParamInvalidId /* SBT Record Offset */,
-              KRayParamInvalidId /* SBT Record Stride */, 6 /* Miss Index */,
-              7 /* Ray Origin */, 8 /* Ray TMin */, 9 /* Ray Direction */,
-              10 /* Ray TMax */, 12 /* Payload */,
-              KRayParamInvalidId /* Hit Object Attribute */))
-        return error;
-      // Current Time
-      const uint32_t current_time_id = _.GetOperandTypeId(inst, 11);
-      if (!_.IsFloatScalarType(current_time_id) ||
-          _.GetBitWidth(current_time_id) != 32) {
-        return _.diag(SPV_ERROR_INVALID_DATA, inst)
-               << "Current Times must be a 32-bit float scalar type";
-      }
-
-      break;
-    }
-
-    case spv::Op::OpHitObjectTraceRayNV: {
-      RegisterOpcodeForValidModel(_, inst);
-      if (auto error = ValidateHitObjectPointer(_, inst, 0)) return error;
-
-      if (auto error = ValidateHitObjectInstructionCommonParameters(
-              _, inst, 1 /* Acceleration Struct */,
-              KRayParamInvalidId /* Instance Id */,
-              KRayParamInvalidId /* Primtive Id */,
-              KRayParamInvalidId /* Geometry Index */, 2 /* Ray Flags */,
-              3 /* Cull Mask */, KRayParamInvalidId /* Hit Kind*/,
-              KRayParamInvalidId /* SBT index */, 4 /* SBT Offset */,
-              5 /* SBT Stride */, KRayParamInvalidId /* SBT Record Offset */,
-              KRayParamInvalidId /* SBT Record Stride */, 6 /* Miss Index */,
-              7 /* Ray Origin */, 8 /* Ray TMin */, 9 /* Ray Direction */,
-              10 /* Ray TMax */, 11 /* Payload */,
-              KRayParamInvalidId /* Hit Object Attribute */))
-        return error;
-      break;
-    }
-
-    case spv::Op::OpReorderThreadWithHitObjectNV: {
-      std::string opcode_name = spvOpcodeString(inst->opcode());
-      _.function(inst->function()->id())
-          ->RegisterExecutionModelLimitation(
-              [opcode_name](spv::ExecutionModel model, std::string* message) {
-                if (model != spv::ExecutionModel::RayGenerationKHR) {
-                  if (message) {
-                    *message = opcode_name +
-                               " requires RayGenerationKHR execution model";
-                  }
-                  return false;
-                }
-                return true;
-              });
-
-      if (auto error = ValidateHitObjectPointer(_, inst, 0)) return error;
-
-      if (inst->operands().size() > 1) {
-        if (inst->operands().size() != 3) {
-          return _.diag(SPV_ERROR_INVALID_DATA, inst)
-                 << "Hint and Bits are optional together i.e "
-                 << " Either both Hint and Bits should be provided or neither.";
-        }
-
-        // Validate the optional opreands Hint and Bits
-        const uint32_t hint_id = _.GetOperandTypeId(inst, 1);
-        if (!_.IsIntScalarType(hint_id) || _.GetBitWidth(hint_id) != 32) {
-          return _.diag(SPV_ERROR_INVALID_DATA, inst)
-                 << "Hint must be a 32-bit int scalar";
-        }
-        const uint32_t bits_id = _.GetOperandTypeId(inst, 2);
-        if (!_.IsIntScalarType(bits_id) || _.GetBitWidth(bits_id) != 32) {
-          return _.diag(SPV_ERROR_INVALID_DATA, inst)
-                 << "bits must be a 32-bit int scalar";
-        }
-      }
-      break;
-    }
-
-    case spv::Op::OpReorderThreadWithHintNV: {
-      std::string opcode_name = spvOpcodeString(inst->opcode());
-      _.function(inst->function()->id())
-          ->RegisterExecutionModelLimitation(
-              [opcode_name](spv::ExecutionModel model, std::string* message) {
-                if (model != spv::ExecutionModel::RayGenerationKHR) {
-                  if (message) {
-                    *message = opcode_name +
-                               " requires RayGenerationKHR execution model";
-                  }
-                  return false;
-                }
-                return true;
-              });
-
-      const uint32_t hint_id = _.GetOperandTypeId(inst, 0);
-      if (!_.IsIntScalarType(hint_id) || _.GetBitWidth(hint_id) != 32) {
-        return _.diag(SPV_ERROR_INVALID_DATA, inst)
-               << "Hint must be a 32-bit int scalar";
-      }
-
-      const uint32_t bits_id = _.GetOperandTypeId(inst, 1);
-      if (!_.IsIntScalarType(bits_id) || _.GetBitWidth(bits_id) != 32) {
-        return _.diag(SPV_ERROR_INVALID_DATA, inst)
-               << "bits must be a 32-bit int scalar";
-      }
-    }
-
-    default:
-      break;
-  }
-  return SPV_SUCCESS;
-}
-}  // namespace val
-}  // namespace spvtools
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/val/validation_state.cpp b/third_party/vulkan-deps/spirv-tools/src/source/val/validation_state.cpp
index c95eec3..d7a196c 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/val/validation_state.cpp
+++ b/third_party/vulkan-deps/spirv-tools/src/source/val/validation_state.cpp
@@ -790,22 +790,6 @@
               }
               return true;
             });
-  } else if (storage_class == spv::StorageClass::HitObjectAttributeNV) {
-    function(consumer->function()->id())
-        ->RegisterExecutionModelLimitation([](spv::ExecutionModel model,
-                                              std::string* message) {
-          if (model != spv::ExecutionModel::RayGenerationKHR &&
-              model != spv::ExecutionModel::ClosestHitKHR &&
-              model != spv::ExecutionModel::MissKHR) {
-            if (message) {
-              *message =
-                  "HitObjectAttributeNV Storage Class is limited to "
-                  "RayGenerationKHR, ClosestHitKHR or MissKHR execution model";
-            }
-            return false;
-          }
-          return true;
-        });
   }
 }
 
@@ -1571,7 +1555,6 @@
       case spv::StorageClass::IncomingCallableDataKHR:
       case spv::StorageClass::ShaderRecordBufferKHR:
       case spv::StorageClass::TaskPayloadWorkgroupEXT:
-      case spv::StorageClass::HitObjectAttributeNV:
         return true;
       default:
         return false;
@@ -2077,14 +2060,20 @@
       return VUID_WRAP(VUID-StandaloneSpirv-RayPayloadKHR-04698);
     case 4699:
       return VUID_WRAP(VUID-StandaloneSpirv-IncomingRayPayloadKHR-04699);
+    case 4700:
+      return VUID_WRAP(VUID-StandaloneSpirv-IncomingRayPayloadKHR-04700);
     case 4701:
       return VUID_WRAP(VUID-StandaloneSpirv-HitAttributeKHR-04701);
+    case 4702:
+      return VUID_WRAP(VUID-StandaloneSpirv-HitAttributeKHR-04702);
     case 4703:
       return VUID_WRAP(VUID-StandaloneSpirv-HitAttributeKHR-04703);
     case 4704:
       return VUID_WRAP(VUID-StandaloneSpirv-CallableDataKHR-04704);
     case 4705:
       return VUID_WRAP(VUID-StandaloneSpirv-IncomingCallableDataKHR-04705);
+    case 4706:
+      return VUID_WRAP(VUID-StandaloneSpirv-IncomingCallableDataKHR-04706);
     case 7119:
       return VUID_WRAP(VUID-StandaloneSpirv-ShaderRecordBufferKHR-07119);
     case 4708:
@@ -2143,6 +2132,8 @@
       return VUID_WRAP(VUID-StandaloneSpirv-OpTypeSampledImage-06671);
     case 6672:
       return VUID_WRAP(VUID-StandaloneSpirv-Location-06672);
+    case 6673:
+      return VUID_WRAP(VUID-StandaloneSpirv-OpVariable-06673);
     case 6674:
       return VUID_WRAP(VUID-StandaloneSpirv-OpEntryPoint-06674);
     case 6675:
diff --git a/third_party/vulkan-deps/spirv-tools/src/test/opt/CMakeLists.txt b/third_party/vulkan-deps/spirv-tools/src/test/opt/CMakeLists.txt
index af24e65..36bf04c 100644
--- a/third_party/vulkan-deps/spirv-tools/src/test/opt/CMakeLists.txt
+++ b/third_party/vulkan-deps/spirv-tools/src/test/opt/CMakeLists.txt
@@ -43,7 +43,7 @@
        desc_sroa_test.cpp
        eliminate_dead_const_test.cpp
        eliminate_dead_functions_test.cpp
-       eliminate_dead_io_components_test.cpp
+       eliminate_dead_input_components_test.cpp
        eliminate_dead_member_test.cpp
        eliminate_dead_output_stores_test.cpp
        feature_manager_test.cpp
diff --git a/third_party/vulkan-deps/spirv-tools/src/test/opt/aggressive_dead_code_elim_test.cpp b/third_party/vulkan-deps/spirv-tools/src/test/opt/aggressive_dead_code_elim_test.cpp
index 0d94151..e51098e 100644
--- a/third_party/vulkan-deps/spirv-tools/src/test/opt/aggressive_dead_code_elim_test.cpp
+++ b/third_party/vulkan-deps/spirv-tools/src/test/opt/aggressive_dead_code_elim_test.cpp
@@ -7777,86 +7777,6 @@
   SinglePassRunAndMatch<AggressiveDCEPass>(text, true);
 }
 
-TEST_F(AggressiveDCETest, RemoveOutputTrue) {
-  // Remove dead n_out output variable from module
-  const std::string text = R"(
-               OpCapability Shader
-          %1 = OpExtInstImport "GLSL.std.450"
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint Vertex %main "main" %c_out %c_in %n_out
-;CHECK: OpEntryPoint Vertex %main "main" %c_out %c_in
-               OpSource GLSL 450
-               OpName %main "main"
-               OpName %c_out "c_out"
-               OpName %c_in "c_in"
-               OpName %n_out "n_out"
-               OpDecorate %c_out Location 0
-               OpDecorate %c_in Location 0
-               OpDecorate %n_out Location 1
-       %void = OpTypeVoid
-          %3 = OpTypeFunction %void
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-      %c_out = OpVariable %_ptr_Output_v4float Output
-%_ptr_Input_v4float = OpTypePointer Input %v4float
-       %c_in = OpVariable %_ptr_Input_v4float Input
-    %v3float = OpTypeVector %float 3
-%_ptr_Output_v3float = OpTypePointer Output %v3float
-      %n_out = OpVariable %_ptr_Output_v3float Output
-       %main = OpFunction %void None %3
-          %5 = OpLabel
-         %12 = OpLoad %v4float %c_in
-               OpStore %c_out %12
-               OpReturn
-               OpFunctionEnd
-)";
-
-  SetTargetEnv(SPV_ENV_VULKAN_1_3);
-  SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
-  SinglePassRunAndMatch<AggressiveDCEPass>(text, true, false, true);
-}
-
-TEST_F(AggressiveDCETest, RemoveOutputFalse) {
-  // Remove dead n_out output variable from module
-  const std::string text = R"(
-               OpCapability Shader
-          %1 = OpExtInstImport "GLSL.std.450"
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint Vertex %main "main" %c_out %c_in %n_out
-;CHECK: OpEntryPoint Vertex %main "main" %c_out %c_in %n_out
-               OpSource GLSL 450
-               OpName %main "main"
-               OpName %c_out "c_out"
-               OpName %c_in "c_in"
-               OpName %n_out "n_out"
-               OpDecorate %c_out Location 0
-               OpDecorate %c_in Location 0
-               OpDecorate %n_out Location 1
-       %void = OpTypeVoid
-          %3 = OpTypeFunction %void
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-      %c_out = OpVariable %_ptr_Output_v4float Output
-%_ptr_Input_v4float = OpTypePointer Input %v4float
-       %c_in = OpVariable %_ptr_Input_v4float Input
-    %v3float = OpTypeVector %float 3
-%_ptr_Output_v3float = OpTypePointer Output %v3float
-      %n_out = OpVariable %_ptr_Output_v3float Output
-       %main = OpFunction %void None %3
-          %5 = OpLabel
-         %12 = OpLoad %v4float %c_in
-               OpStore %c_out %12
-               OpReturn
-               OpFunctionEnd
-)";
-
-  SetTargetEnv(SPV_ENV_VULKAN_1_3);
-  SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
-  SinglePassRunAndMatch<AggressiveDCEPass>(text, true, false, false);
-}
-
 }  // namespace
 }  // namespace opt
 }  // namespace spvtools
diff --git a/third_party/vulkan-deps/spirv-tools/src/test/opt/eliminate_dead_io_components_test.cpp b/third_party/vulkan-deps/spirv-tools/src/test/opt/eliminate_dead_input_components_test.cpp
similarity index 93%
rename from third_party/vulkan-deps/spirv-tools/src/test/opt/eliminate_dead_io_components_test.cpp
rename to third_party/vulkan-deps/spirv-tools/src/test/opt/eliminate_dead_input_components_test.cpp
index f175e49..48bda22 100644
--- a/third_party/vulkan-deps/spirv-tools/src/test/opt/eliminate_dead_io_components_test.cpp
+++ b/third_party/vulkan-deps/spirv-tools/src/test/opt/eliminate_dead_input_components_test.cpp
@@ -23,9 +23,9 @@
 namespace opt {
 namespace {
 
-using ElimDeadIOComponentsTest = PassTest<::testing::Test>;
+using ElimDeadInputComponentsTest = PassTest<::testing::Test>;
 
-TEST_F(ElimDeadIOComponentsTest, ElimOneConstantIndex) {
+TEST_F(ElimDeadInputComponentsTest, ElimOneConstantIndex) {
   // Should reduce to uv[2]
   //
   // #version 450
@@ -85,11 +85,11 @@
 
   SetTargetEnv(SPV_ENV_VULKAN_1_3);
   SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
-  SinglePassRunAndMatch<EliminateDeadIOComponentsPass>(
-      text, true, spv::StorageClass::Input, false);
+  SinglePassRunAndMatch<EliminateDeadInputComponentsPass>(text, true, false,
+                                                          false);
 }
 
-TEST_F(ElimDeadIOComponentsTest, ElimOneConstantIndexInBounds) {
+TEST_F(ElimDeadInputComponentsTest, ElimOneConstantIndexInBounds) {
   // Same as ElimOneConstantIndex but with OpInBoundsAccessChain
   const std::string text = R"(
                OpCapability Shader
@@ -136,11 +136,11 @@
 
   SetTargetEnv(SPV_ENV_VULKAN_1_3);
   SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
-  SinglePassRunAndMatch<EliminateDeadIOComponentsPass>(
-      text, true, spv::StorageClass::Input, false);
+  SinglePassRunAndMatch<EliminateDeadInputComponentsPass>(text, true, false,
+                                                          false);
 }
 
-TEST_F(ElimDeadIOComponentsTest, ElimTwoConstantIndices) {
+TEST_F(ElimDeadInputComponentsTest, ElimTwoConstantIndices) {
   // Should reduce to uv[4]
   //
   // #version 450
@@ -204,11 +204,11 @@
 
   SetTargetEnv(SPV_ENV_VULKAN_1_3);
   SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
-  SinglePassRunAndMatch<EliminateDeadIOComponentsPass>(
-      text, true, spv::StorageClass::Input, false);
+  SinglePassRunAndMatch<EliminateDeadInputComponentsPass>(text, true, false,
+                                                          false);
 }
 
-TEST_F(ElimDeadIOComponentsTest, NoElimMaxConstantIndex) {
+TEST_F(ElimDeadInputComponentsTest, NoElimMaxConstantIndex) {
   // Should not reduce uv[8] because of max index of 7
   //
   // #version 450
@@ -271,11 +271,11 @@
 
   SetTargetEnv(SPV_ENV_VULKAN_1_3);
   SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
-  SinglePassRunAndMatch<EliminateDeadIOComponentsPass>(
-      text, true, spv::StorageClass::Input, false);
+  SinglePassRunAndMatch<EliminateDeadInputComponentsPass>(text, true, false,
+                                                          false);
 }
 
-TEST_F(ElimDeadIOComponentsTest, NoElimNonConstantIndex) {
+TEST_F(ElimDeadInputComponentsTest, NoElimNonConstantIndex) {
   // Should not reduce uv[8] because of non-constant index of ui
   //
   // #version 450
@@ -354,11 +354,11 @@
 
   SetTargetEnv(SPV_ENV_VULKAN_1_3);
   SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
-  SinglePassRunAndMatch<EliminateDeadIOComponentsPass>(
-      text, true, spv::StorageClass::Input, false);
+  SinglePassRunAndMatch<EliminateDeadInputComponentsPass>(text, true, false,
+                                                          false);
 }
 
-TEST_F(ElimDeadIOComponentsTest, NoElimNonIndexedAccessChain) {
+TEST_F(ElimDeadInputComponentsTest, NoElimNonIndexedAccessChain) {
   // Should not change due to non-indexed access chain
   const std::string text = R"(
                OpCapability Shader
@@ -401,11 +401,11 @@
 
   SetTargetEnv(SPV_ENV_VULKAN_1_3);
   SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
-  SinglePassRunAndMatch<EliminateDeadIOComponentsPass>(
-      text, true, spv::StorageClass::Input, false);
+  SinglePassRunAndMatch<EliminateDeadInputComponentsPass>(text, true, false,
+                                                          false);
 }
 
-TEST_F(ElimDeadIOComponentsTest, ElimStructMember) {
+TEST_F(ElimDeadInputComponentsTest, ElimStructMember) {
   // Should eliminate uv
   //
   // #version 450
@@ -466,11 +466,11 @@
 
   SetTargetEnv(SPV_ENV_VULKAN_1_3);
   SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
-  SinglePassRunAndMatch<EliminateDeadIOComponentsPass>(
-      text, true, spv::StorageClass::Input, false);
+  SinglePassRunAndMatch<EliminateDeadInputComponentsPass>(text, true, false,
+                                                          false);
 }
 
-TEST_F(ElimDeadIOComponentsTest, ElimOutputStructMember) {
+TEST_F(ElimDeadInputComponentsTest, ElimOutputStructMember) {
   // Should eliminate uv from Vertex and all but gl_Position from gl_PerVertex
   //
   // #version 450
@@ -565,11 +565,11 @@
 
   SetTargetEnv(SPV_ENV_VULKAN_1_3);
   SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
-  SinglePassRunAndMatch<EliminateDeadIOComponentsPass>(
-      text, true, spv::StorageClass::Output, false);
+  SinglePassRunAndMatch<EliminateDeadInputComponentsPass>(text, true, true,
+                                                          false);
 }
 
-TEST_F(ElimDeadIOComponentsTest, ElimOutputArrayMembers) {
+TEST_F(ElimDeadInputComponentsTest, ElimOutputArrayMembers) {
   // Should reduce to uv[2]
   //
   // #version 450
@@ -618,11 +618,11 @@
 
   SetTargetEnv(SPV_ENV_VULKAN_1_3);
   SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
-  SinglePassRunAndMatch<EliminateDeadIOComponentsPass>(
-      text, true, spv::StorageClass::Output, false);
+  SinglePassRunAndMatch<EliminateDeadInputComponentsPass>(text, true, true,
+                                                          false);
 }
 
-TEST_F(ElimDeadIOComponentsTest, VertexOnly) {
+TEST_F(ElimDeadInputComponentsTest, VertexOnly) {
   // Should NOT eliminate uv
   //
   // #version 450
@@ -682,11 +682,11 @@
 
   SetTargetEnv(SPV_ENV_VULKAN_1_3);
   SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
-  SinglePassRunAndMatch<EliminateDeadIOComponentsPass>(
-      text, true, spv::StorageClass::Input, true);
+  SinglePassRunAndMatch<EliminateDeadInputComponentsPass>(text, true, false,
+                                                          true);
 }
 
-TEST_F(ElimDeadIOComponentsTest, TescInput) {
+TEST_F(ElimDeadInputComponentsTest, TescInput) {
   // Eliminate PointSize, ClipDistance, CullDistance from gl_in[]
   //
   // #version 450
@@ -771,11 +771,11 @@
 
   SetTargetEnv(SPV_ENV_VULKAN_1_3);
   SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
-  SinglePassRunAndMatch<EliminateDeadIOComponentsPass>(
-      text, true, spv::StorageClass::Input, false);
+  SinglePassRunAndMatch<EliminateDeadInputComponentsPass>(text, true, false,
+                                                          false);
 }
 
-TEST_F(ElimDeadIOComponentsTest, TescOutput) {
+TEST_F(ElimDeadInputComponentsTest, TescOutput) {
   // Eliminate PointSize, ClipDistance, CullDistance from gl_out[]
   //
   // #version 450
@@ -859,11 +859,11 @@
 
   SetTargetEnv(SPV_ENV_VULKAN_1_3);
   SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
-  SinglePassRunAndMatch<EliminateDeadIOComponentsPass>(
-      text, true, spv::StorageClass::Output, false);
+  SinglePassRunAndMatch<EliminateDeadInputComponentsPass>(text, true, true,
+                                                          false);
 }
 
-TEST_F(ElimDeadIOComponentsTest, TeseInput) {
+TEST_F(ElimDeadInputComponentsTest, TeseInput) {
   // Eliminate PointSize, ClipDistance, CullDistance from gl_in[]
   //
   // #version 450
@@ -946,11 +946,11 @@
 
   SetTargetEnv(SPV_ENV_VULKAN_1_3);
   SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
-  SinglePassRunAndMatch<EliminateDeadIOComponentsPass>(
-      text, true, spv::StorageClass::Input, false);
+  SinglePassRunAndMatch<EliminateDeadInputComponentsPass>(text, true, false,
+                                                          false);
 }
 
-TEST_F(ElimDeadIOComponentsTest, TeseOutput) {
+TEST_F(ElimDeadInputComponentsTest, TeseOutput) {
   // Eliminate PointSize, ClipDistance, CullDistance from gl_out
   //
   // #version 450
@@ -1030,11 +1030,11 @@
 
   SetTargetEnv(SPV_ENV_VULKAN_1_3);
   SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
-  SinglePassRunAndMatch<EliminateDeadIOComponentsPass>(
-      text, true, spv::StorageClass::Output, false);
+  SinglePassRunAndMatch<EliminateDeadInputComponentsPass>(text, true, true,
+                                                          false);
 }
 
-TEST_F(ElimDeadIOComponentsTest, GeomInput) {
+TEST_F(ElimDeadInputComponentsTest, GeomInput) {
   // Eliminate PointSize, ClipDistance, CullDistance from gl_in[]
   //
   // #version 450
@@ -1138,11 +1138,11 @@
 
   SetTargetEnv(SPV_ENV_VULKAN_1_3);
   SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
-  SinglePassRunAndMatch<EliminateDeadIOComponentsPass>(
-      text, true, spv::StorageClass::Input, false);
+  SinglePassRunAndMatch<EliminateDeadInputComponentsPass>(text, true, false,
+                                                          false);
 }
 
-TEST_F(ElimDeadIOComponentsTest, GeomOutput) {
+TEST_F(ElimDeadInputComponentsTest, GeomOutput) {
   // Eliminate PointSize, ClipDistance, CullDistance from gl_out
   //
   // #version 450
@@ -1245,8 +1245,8 @@
 
   SetTargetEnv(SPV_ENV_VULKAN_1_3);
   SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
-  SinglePassRunAndMatch<EliminateDeadIOComponentsPass>(
-      text, true, spv::StorageClass::Output, false);
+  SinglePassRunAndMatch<EliminateDeadInputComponentsPass>(text, true, true,
+                                                          false);
 }
 
 }  // namespace
diff --git a/third_party/vulkan-deps/spirv-tools/src/test/opt/fold_spec_const_op_composite_test.cpp b/third_party/vulkan-deps/spirv-tools/src/test/opt/fold_spec_const_op_composite_test.cpp
index aae9eb2..e2374c5 100644
--- a/third_party/vulkan-deps/spirv-tools/src/test/opt/fold_spec_const_op_composite_test.cpp
+++ b/third_party/vulkan-deps/spirv-tools/src/test/opt/fold_spec_const_op_composite_test.cpp
@@ -374,33 +374,6 @@
   SinglePassRunAndMatch<FoldSpecConstantOpAndCompositePass>(test, false);
 }
 
-TEST_F(FoldSpecConstantOpAndCompositePassBasicTest, CompositeInsertNull) {
-  const std::string test =
-      R"(
-               OpCapability Shader
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint GLCompute %1 "main"
-               OpExecutionMode %1 LocalSize 1 1 1
-       %void = OpTypeVoid
-          %3 = OpTypeFunction %void
-      %float = OpTypeFloat 32
-%v2float = OpTypeVector %float 2
-%mat2v2float = OpTypeMatrix %v2float 2
-%null = OpConstantNull %mat2v2float
-    %float_1 = OpConstant %float 1
-  %v2float_1 = OpConstantComposite %v2float %float_1 %float_1
-   %mat2v2_1 = OpConstantComposite %mat2v2float %v2float_1 %v2float_1
- ; CHECK: %13 = OpConstantNull %mat2v2float
-         %14 = OpSpecConstantOp %mat2v2float CompositeInsert %mat2v2_1 %null 0 0
-          %1 = OpFunction %void None %3
-         %16 = OpLabel
-               OpReturn
-               OpFunctionEnd
-)";
-
-  SinglePassRunAndMatch<FoldSpecConstantOpAndCompositePass>(test, false);
-}
-
 // All types and some common constants that are potentially required in
 // FoldSpecConstantOpAndCompositeTest.
 std::vector<std::string> CommonTypesAndConstants() {
diff --git a/third_party/vulkan-deps/spirv-tools/src/test/opt/type_manager_test.cpp b/third_party/vulkan-deps/spirv-tools/src/test/opt/type_manager_test.cpp
index bc80050..eebc50d 100644
--- a/third_party/vulkan-deps/spirv-tools/src/test/opt/type_manager_test.cpp
+++ b/third_party/vulkan-deps/spirv-tools/src/test/opt/type_manager_test.cpp
@@ -172,7 +172,6 @@
   types.emplace_back(new AccelerationStructureNV());
   types.emplace_back(new CooperativeMatrixNV(f32, 24, 24, 24));
   types.emplace_back(new RayQueryKHR());
-  types.emplace_back(new HitObjectNV());
 
   return types;
 }
@@ -1086,7 +1085,6 @@
 ; CHECK: OpTypeAccelerationStructureKHR
 ; CHECK: OpTypeCooperativeMatrixNV [[f32]] [[uint24]] [[uint24]] [[uint24]]
 ; CHECK: OpTypeRayQueryKHR
-; CHECK: OpTypeHitObjectNV
 OpCapability Shader
 OpCapability Int64
 OpCapability Linkage
diff --git a/third_party/vulkan-deps/spirv-tools/src/test/val/CMakeLists.txt b/third_party/vulkan-deps/spirv-tools/src/test/val/CMakeLists.txt
index 62d93bd..de89b93 100644
--- a/third_party/vulkan-deps/spirv-tools/src/test/val/CMakeLists.txt
+++ b/third_party/vulkan-deps/spirv-tools/src/test/val/CMakeLists.txt
@@ -93,7 +93,6 @@
   SRCS
        val_ray_query_test.cpp
        val_ray_tracing_test.cpp
-       val_ray_tracing_reorder_test.cpp
        val_small_type_uses_test.cpp
        val_ssa_test.cpp
        val_state_test.cpp
diff --git a/third_party/vulkan-deps/spirv-tools/src/test/val/val_decoration_test.cpp b/third_party/vulkan-deps/spirv-tools/src/test/val/val_decoration_test.cpp
index ff62f4b..dae6c26 100644
--- a/third_party/vulkan-deps/spirv-tools/src/test/val/val_decoration_test.cpp
+++ b/third_party/vulkan-deps/spirv-tools/src/test/val/val_decoration_test.cpp
@@ -3210,6 +3210,48 @@
           "statically used per shader entry point."));
 }
 
+TEST_F(ValidateDecorations,
+       VulkanMultiplePushConstantsSingleEntryPointInterfaceBad) {
+  std::string spirv = R"(
+            OpCapability Shader
+            OpMemoryModel Logical GLSL450
+            OpEntryPoint Vertex %func1 "func1" %pc1 %pc2
+            OpDecorate %struct Block
+            OpMemberDecorate %struct 0 Offset 0
+    %void = OpTypeVoid
+  %voidfn = OpTypeFunction %void
+   %float = OpTypeFloat 32
+     %int = OpTypeInt 32 0
+   %int_0 = OpConstant %int 0
+  %struct = OpTypeStruct %float
+     %ptr = OpTypePointer PushConstant %struct
+%ptr_float = OpTypePointer PushConstant %float
+     %pc1 = OpVariable %ptr PushConstant
+     %pc2 = OpVariable %ptr PushConstant
+   %func1 = OpFunction %void None %voidfn
+  %label1 = OpLabel
+ %access1 = OpAccessChain %ptr_float %pc1 %int_0
+   %load1 = OpLoad %float %access1
+            OpReturn
+            OpFunctionEnd
+   %func2 = OpFunction %void None %voidfn
+  %label2 = OpLabel
+ %access2 = OpAccessChain %ptr_float %pc2 %int_0
+   %load2 = OpLoad %float %access2
+            OpReturn
+            OpFunctionEnd
+)";
+
+  CompileSuccessfully(spirv, SPV_ENV_VULKAN_1_2);
+  EXPECT_EQ(SPV_ERROR_INVALID_DATA,
+            ValidateAndRetrieveValidationState(SPV_ENV_VULKAN_1_2));
+  EXPECT_THAT(getDiagnosticString(),
+              AnyVUID("VUID-StandaloneSpirv-OpVariable-06673"));
+  EXPECT_THAT(getDiagnosticString(),
+              HasSubstr("Entry-point has more than one variable with the "
+                        "PushConstant storage class in the interface"));
+}
+
 TEST_F(ValidateDecorations, VulkanUniformMissingDescriptorSetBad) {
   std::string spirv = R"(
             OpCapability Shader
diff --git a/third_party/vulkan-deps/spirv-tools/src/test/val/val_ray_tracing_reorder_test.cpp b/third_party/vulkan-deps/spirv-tools/src/test/val/val_ray_tracing_reorder_test.cpp
deleted file mode 100644
index 6038c38..0000000
--- a/third_party/vulkan-deps/spirv-tools/src/test/val/val_ray_tracing_reorder_test.cpp
+++ /dev/null
@@ -1,598 +0,0 @@
-// Copyright (c) 2022 The Khronos Group 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.
-
-// Tests instructions from SPV_NV_shader_invocation_reorder.
-
-#include <sstream>
-#include <string>
-
-#include "gmock/gmock.h"
-#include "test/val/val_fixtures.h"
-
-namespace spvtools {
-namespace val {
-namespace {
-
-using ::testing::HasSubstr;
-using ::testing::Values;
-
-using ValidateRayTracingReorderNV = spvtest::ValidateBase<bool>;
-
-std::string GenerateReorderThreadCode(const std::string& body = "",
-                                      const std::string& declarations = "") {
-  std::ostringstream ss;
-  ss << R"(
-            OpCapability RayTracingKHR
-            OpCapability ShaderInvocationReorderNV
-            OpExtension "SPV_KHR_ray_tracing"
-            OpExtension "SPV_NV_shader_invocation_reorder"
-       %1 = OpExtInstImport "GLSL.std.450"
-            OpMemoryModel Logical GLSL450
-            OpEntryPoint RayGenerationNV %main "main" %hObj
-            OpSourceExtension "GL_EXT_ray_tracing"
-            OpSourceExtension "GL_NV_shader_invocation_reorder"
-            OpName %main "main"
-    %void = OpTypeVoid
-       %3 = OpTypeFunction %void
-       %6 = OpTypeHitObjectNV
-%_ptr_Private_6 = OpTypePointer Private %6
-    %hObj = OpVariable %_ptr_Private_6 Private
-    )";
-  ss << declarations;
-
-  ss << R"(
-   %main  = OpFunction %void None %3
-     %5   = OpLabel 
-    )";
-
-  ss << body;
-
-  ss << R"(
-            OpReturn
-            OpFunctionEnd
-    )";
-  return ss.str();
-}
-
-TEST_F(ValidateRayTracingReorderNV, ReorderThreadWithHintNV) {
-  const std::string declarations = R"(
-             %uint = OpTypeInt 32 0
-           %uint_4 = OpConstant %uint 4
-  )";
-
-  const std::string body = R"(
-    OpReorderThreadWithHintNV %uint_4 %uint_4
-  )";
-
-  CompileSuccessfully(GenerateReorderThreadCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV, ReorderThreadWithHitObjectNV) {
-  const std::string declarations = R"(
-      %uint = OpTypeInt 32 0
-    %uint_4 = OpConstant %uint 4
-    %uint_2 = OpConstant %uint 2
-  )";
-
-  const std::string body = R"(
-             OpReorderThreadWithHitObjectNV %hObj
-             OpReorderThreadWithHitObjectNV %hObj %uint_4 %uint_2
-  )";
-
-  CompileSuccessfully(GenerateReorderThreadCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-std::string GenerateReorderShaderCode(
-    const std::string& body = "", const std::string& declarations = "",
-    const std::string execution_model = "RayGenerationKHR") {
-  std::ostringstream ss;
-  ss << R"(
-               OpCapability RayTracingKHR
-               OpCapability ShaderInvocationReorderNV
-               OpExtension "SPV_KHR_ray_tracing"
-               OpExtension "SPV_NV_shader_invocation_reorder"
-          %1 = OpExtInstImport "GLSL.std.450"
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint )"
-     << execution_model
-     << R"( %main "main" %attr %_ %hObj %payload %__0 %as %__1
-               OpSource GLSL 460
-               OpSourceExtension "GL_EXT_ray_tracing"
-               OpSourceExtension "GL_NV_shader_invocation_reorder"
-               OpName %main "main"
-               OpName %attr "attr"
-               OpName %hBlock "hBlock"
-               OpMemberName %hBlock 0 "attrval"
-               OpName %_ ""
-               OpName %hObj "hObj"
-               OpName %payload "payload"
-               OpName %pBlock "pBlock"
-               OpMemberName %pBlock 0 "val1"
-               OpMemberName %pBlock 1 "val2"
-               OpName %__0 ""
-               OpName %as "as"
-               OpName %block "block"
-               OpMemberName %block 0 "op"
-               OpName %__1 ""
-               OpDecorate %hBlock Block
-               OpDecorate %pBlock Block
-               OpDecorate %as DescriptorSet 0
-               OpDecorate %as Binding 0
-               OpMemberDecorate %block 0 Offset 0
-               OpDecorate %block Block
-               OpDecorate %__1 DescriptorSet 0
-               OpDecorate %__1 Binding 1
-       %void = OpTypeVoid
-          %3 = OpTypeFunction %void
-      %float = OpTypeFloat 32
-    %v2float = OpTypeVector %float 2
-%_ptr_HitObjectAttributeNV_v2float = OpTypePointer HitObjectAttributeNV %v2float
-       %attr = OpVariable %_ptr_HitObjectAttributeNV_v2float HitObjectAttributeNV
-    %float_1 = OpConstant %float 1
-         %11 = OpConstantComposite %v2float %float_1 %float_1
-     %hBlock = OpTypeStruct %float
-%_ptr_HitObjectAttributeNV_hBlock = OpTypePointer HitObjectAttributeNV %hBlock
-          %_ = OpVariable %_ptr_HitObjectAttributeNV_hBlock HitObjectAttributeNV
-        %int = OpTypeInt 32 1
-      %int_0 = OpConstant %int 0
-    %float_2 = OpConstant %float 2
-%_ptr_HitObjectAttributeNV_float = OpTypePointer HitObjectAttributeNV %float
-             %20 = OpTypeHitObjectNV
-    %_ptr_Private_20 = OpTypePointer Private %20
-           %hObj = OpVariable %_ptr_Private_20 Private
-             %23 = OpTypeAccelerationStructureKHR
-    %_ptr_UniformConstant_23 = OpTypePointer UniformConstant %23
-             %as = OpVariable %_ptr_UniformConstant_23 UniformConstant
-    %v4float = OpTypeVector %float 4
-%_ptr_RayPayloadNV_v4float = OpTypePointer RayPayloadNV %v4float
-    %payload = OpVariable %_ptr_RayPayloadNV_v4float RayPayloadNV
-     %pBlock = OpTypeStruct %v2float %v2float
-%_ptr_RayPayloadNV_pBlock = OpTypePointer RayPayloadNV %pBlock
-        %__0 = OpVariable %_ptr_RayPayloadNV_pBlock RayPayloadNV
-      %block = OpTypeStruct %float
-%_ptr_StorageBuffer_block = OpTypePointer StorageBuffer %block
-        %__1 = OpVariable %_ptr_StorageBuffer_block StorageBuffer
-       )";
-
-  ss << declarations;
-
-  ss << R"(
-        %main = OpFunction %void None %3
-          %5 = OpLabel 
-         )";
-
-  ss << body;
-
-  ss << R"(
-               OpReturn
-               OpFunctionEnd)";
-  return ss.str();
-}
-
-TEST_F(ValidateRayTracingReorderNV, HitObjectTraceRayNV) {
-  const std::string declarations = R"(
-       %uint = OpTypeInt 32 0
-     %uint_1 = OpConstant %uint 1
-    %v3float = OpTypeVector %float 3
-  %float_0_5 = OpConstant %float 0.5
-         %31 = OpConstantComposite %v3float %float_0_5 %float_0_5 %float_0_5
-         %32 = OpConstantComposite %v3float %float_1 %float_1 %float_1
-      %int_1 = OpConstant %int 1
-  )";
-
-  const std::string body = R"(
-  OpStore %attr %11
-  %26 = OpLoad %23 %as
-  OpHitObjectTraceRayNV %hObj %26 %uint_1 %uint_1 %uint_1 %uint_1 %uint_1 %31 %float_0_5 %32 %float_1 %payload
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV, HitObjectTraceRayMotionNV) {
-  const std::string declarations = R"(
-        %uint = OpTypeInt 32 0
-      %uint_1 = OpConstant %uint 1
-     %v3float = OpTypeVector %float 3
-   %float_0_5 = OpConstant %float 0.5
-          %31 = OpConstantComposite %v3float %float_0_5 %float_0_5 %float_0_5
-          %32 = OpConstantComposite %v3float %float_1 %float_1 %float_1
-    %float_10 = OpConstant %float 10
-       %int_2 = OpConstant %int 2
-  )";
-
-  const std::string body = R"(
-      OpStore %attr %11
-      %26 = OpLoad %23 %as
-      OpHitObjectTraceRayMotionNV %hObj %26 %uint_1 %uint_1 %uint_1 %uint_1 %uint_1 %31 %float_0_5 %32 %float_1 %float_10 %__0
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV, HitObjectRecordHitNV) {
-  const std::string declarations = R"(
-        %int_1 = OpConstant %int 1
-        %uint = OpTypeInt 32 0
-      %uint_2 = OpConstant %uint 2
-     %v3float = OpTypeVector %float 3
-   %float_0_5 = OpConstant %float 0.5
-          %31 = OpConstantComposite %v3float %float_0_5 %float_0_5 %float_0_5
-          %32 = OpConstantComposite %v3float %float_1 %float_1 %float_1
-    %float_10 = OpConstant %float 10
-       %int_2 = OpConstant %int 2
-  )";
-
-  const std::string body = R"(
-      OpStore %attr %11
-      %26 = OpLoad %23 %as
-      OpHitObjectRecordHitNV %hObj %26 %int_1 %int_1 %int_1 %uint_2 %uint_2 %uint_2 %31 %float_1 %32 %float_2 %attr
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV, HitObjectRecordHitWithIndexNV) {
-  const std::string declarations = R"(
-        %int_1 = OpConstant %int 1
-        %uint = OpTypeInt 32 0
-      %uint_2 = OpConstant %uint 2
-     %v3float = OpTypeVector %float 3
-   %float_0_5 = OpConstant %float 0.5
-          %31 = OpConstantComposite %v3float %float_0_5 %float_0_5 %float_0_5
-          %32 = OpConstantComposite %v3float %float_1 %float_1 %float_1
-    %float_10 = OpConstant %float 10
-       %int_2 = OpConstant %int 2
-  )";
-
-  const std::string body = R"(
-      OpStore %attr %11
-      %26 = OpLoad %23 %as
-      OpHitObjectRecordHitWithIndexNV %hObj %26 %int_1 %int_1 %int_1 %uint_2 %uint_2 %31 %float_1 %32 %float_2 %_
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV, HitObjectRecordEmptyNV) {
-  const std::string body = R"(
-      OpHitObjectRecordEmptyNV %hObj
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV, HitObjectRecordMissNV) {
-  const std::string declarations = R"(
-         %uint = OpTypeInt 32 0
-       %uint_1 = OpConstant %uint 1
-      %v3float = OpTypeVector %float 3
-    %float_0_5 = OpConstant %float 0.5
-           %29 = OpConstantComposite %v3float %float_0_5 %float_0_5 %float_0_5
-    %float_1_5 = OpConstant %float 1.5
-           %31 = OpConstantComposite %v3float %float_1_5 %float_1_5 %float_1_5
-      %float_5 = OpConstant %float 5
-  )";
-
-  const std::string body = R"(
-      OpHitObjectRecordMissNV %hObj %uint_1 %29 %float_2 %31 %float_5
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV, HitObjectIsHitNV) {
-  const std::string declarations = R"(
-        %bool = OpTypeBool
-        %_ptr_StorageBuffer_float = OpTypePointer StorageBuffer %float
-  )";
-
-  const std::string body = R"(
-      %26 = OpHitObjectIsHitNV %bool %hObj
-            OpSelectionMerge %28 None
-            OpBranchConditional %26 %27 %28
-      %27 = OpLabel
-      %33 = OpAccessChain %_ptr_StorageBuffer_float %__1 %int_0
-            OpStore %33 %float_1
-            OpBranch %28
-      %28 = OpLabel
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV, HitObjectGetRayTMaxNV) {
-  const std::string declarations = R"(
-        %_ptr_Function_float = OpTypePointer Function %float
-  )";
-
-  const std::string body = R"(
-      %tmin = OpVariable %_ptr_Function_float Function
-      %12 = OpHitObjectGetRayTMaxNV %float %hObj
-      OpStore %tmin %12
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV, HitObjectGetRayTMinNV) {
-  const std::string declarations = R"(
-        %_ptr_Function_float = OpTypePointer Function %float
-  )";
-
-  const std::string body = R"(
-      %tmin = OpVariable %_ptr_Function_float Function
-      %12 = OpHitObjectGetRayTMinNV %float %hObj
-      OpStore %tmin %12
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV, HitObjectGetWorldRayOriginNV) {
-  const std::string declarations = R"(
-        %v3float = OpTypeVector %float 3
-        %_ptr_Function_v3float = OpTypePointer Function %v3float
-  )";
-
-  const std::string body = R"(
-      %orig = OpVariable %_ptr_Function_v3float Function
-      %13 = OpHitObjectGetWorldRayOriginNV %v3float %hObj
-      OpStore %orig %13
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV, HitObjectGetObjectRayOriginNV) {
-  const std::string declarations = R"(
-        %v3float = OpTypeVector %float 3
-        %_ptr_Function_v3float = OpTypePointer Function %v3float
-  )";
-
-  const std::string body = R"(
-      %oorig = OpVariable %_ptr_Function_v3float Function
-      %13 = OpHitObjectGetObjectRayOriginNV %v3float %hObj
-      OpStore %oorig %13
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV, HitObjectGetWorldRayDirectionNV) {
-  const std::string declarations = R"(
-        %v3float = OpTypeVector %float 3
-        %_ptr_Function_v3float = OpTypePointer Function %v3float
-  )";
-
-  const std::string body = R"(
-      %dir = OpVariable %_ptr_Function_v3float Function
-      %13 = OpHitObjectGetWorldRayDirectionNV %v3float %hObj
-      OpStore %dir %13
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV, HitObjectGetObjectRayDirectionNV) {
-  const std::string declarations = R"(
-        %v3float = OpTypeVector %float 3
-        %_ptr_Function_v3float = OpTypePointer Function %v3float
-  )";
-
-  const std::string body = R"(
-      %odir = OpVariable %_ptr_Function_v3float Function
-      %13 = OpHitObjectGetObjectRayDirectionNV %v3float %hObj
-      OpStore %odir %13
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV, HitObjectGetObjectToWorldNV) {
-  const std::string declarations = R"(
-        %v3float = OpTypeVector %float 3
-        %mat4v3float = OpTypeMatrix %v3float 4
-        %_ptr_Function_mat4v3float = OpTypePointer Function %mat4v3float
-  )";
-
-  const std::string body = R"(
-      %otw = OpVariable %_ptr_Function_mat4v3float Function
-      %14 = OpHitObjectGetObjectToWorldNV %mat4v3float %hObj
-      OpStore %otw %14
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV, HitObjectGetWorldToObjectNV) {
-  const std::string declarations = R"(
-        %v3float = OpTypeVector %float 3
-        %mat4v3float = OpTypeMatrix %v3float 4
-        %_ptr_Function_mat4v3float = OpTypePointer Function %mat4v3float
-  )";
-
-  const std::string body = R"(
-      %wto = OpVariable %_ptr_Function_mat4v3float Function
-      %14 = OpHitObjectGetWorldToObjectNV %mat4v3float %hObj
-      OpStore %wto %14
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV, HitObjectGetInstanceCustomIndexNV) {
-  const std::string declarations = R"(
-        %_ptr_Function_int = OpTypePointer Function %int
-  )";
-
-  const std::string body = R"(
-      %id = OpVariable %_ptr_Function_int Function
-      %12 = OpHitObjectGetInstanceCustomIndexNV %int %hObj
-      OpStore %id %12
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV, HitObjectGetInstanceIdNV) {
-  const std::string declarations = R"(
-        %_ptr_Function_int = OpTypePointer Function %int
-  )";
-
-  const std::string body = R"(
-      %id = OpVariable %_ptr_Function_int Function
-      %12 = OpHitObjectGetInstanceIdNV %int %hObj
-      OpStore %id %12
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV, HitObjectGetPrimitiveIndexNV) {
-  const std::string declarations = R"(
-        %_ptr_Function_int = OpTypePointer Function %int
-  )";
-
-  const std::string body = R"(
-      %id = OpVariable %_ptr_Function_int Function
-      %12 = OpHitObjectGetPrimitiveIndexNV %int %hObj
-      OpStore %id %12
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV, HitObjectGetGeometryIndexNV) {
-  const std::string declarations = R"(
-        %_ptr_Function_int = OpTypePointer Function %int
-  )";
-
-  const std::string body = R"(
-      %id = OpVariable %_ptr_Function_int Function
-      %12 = OpHitObjectGetGeometryIndexNV %int %hObj
-      OpStore %id %12
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV, HitObjectGetHitKindNV) {
-  const std::string declarations = R"(
-    %uint = OpTypeInt 32 0
-    %_ptr_Function_uint = OpTypePointer Function %uint
-  )";
-
-  const std::string body = R"(
-    %uid = OpVariable %_ptr_Function_uint Function
-    %12 = OpHitObjectGetHitKindNV %uint %hObj
-    OpStore %uid %12
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV, HitObjectGetAttributesNV) {
-  const std::string body = R"(
-    OpHitObjectGetAttributesNV %hObj %attr
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV, HitObjectGetShaderRecordBufferHandleNV) {
-  const std::string declarations = R"(
-           %uint = OpTypeInt 32 0
-         %v2uint = OpTypeVector %uint 2
-    %_ptr_Function_v2uint = OpTypePointer Function %v2uint
-  )";
-
-  const std::string body = R"(
-    %handle = OpVariable %_ptr_Function_v2uint Function
-        %13 = OpHitObjectGetShaderRecordBufferHandleNV %v2uint %hObj
-              OpStore %handle %13
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-TEST_F(ValidateRayTracingReorderNV,
-       HitObjectGetShaderBindingTableRecordIndexNV) {
-  const std::string declarations = R"(
-    %uint = OpTypeInt 32 0
-    %_ptr_Function_uint = OpTypePointer Function %uint
-  )";
-
-  const std::string body = R"(
-    %rid = OpVariable %_ptr_Function_uint Function
-     %12 = OpHitObjectGetShaderBindingTableRecordIndexNV %uint %hObj
-           OpStore %rid %12
-  )";
-
-  CompileSuccessfully(GenerateReorderShaderCode(body, declarations).c_str(),
-                      SPV_ENV_VULKAN_1_2);
-  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
-}
-
-}  // namespace
-}  // namespace val
-}  // namespace spvtools
diff --git a/third_party/vulkan-deps/spirv-tools/src/test/val/val_ray_tracing_test.cpp b/third_party/vulkan-deps/spirv-tools/src/test/val/val_ray_tracing_test.cpp
index 58b9356..60f2f89 100644
--- a/third_party/vulkan-deps/spirv-tools/src/test/val/val_ray_tracing_test.cpp
+++ b/third_party/vulkan-deps/spirv-tools/src/test/val/val_ray_tracing_test.cpp
@@ -578,6 +578,95 @@
                         "IncomingRayPayloadKHR"));
 }
 
+TEST_F(ValidateRayTracing, InterfaceIncomingRayPayload) {
+  const std::string body = R"(
+OpCapability RayTracingKHR
+OpExtension "SPV_KHR_ray_tracing"
+OpMemoryModel Logical GLSL450
+OpEntryPoint CallableKHR %main "main" %inData1 %inData2
+OpName %main "main"
+%void = OpTypeVoid
+%func = OpTypeFunction %void
+%int = OpTypeInt 32 1
+%inData_ptr = OpTypePointer IncomingRayPayloadKHR %int
+%inData1 = OpVariable %inData_ptr IncomingRayPayloadKHR
+%inData2 = OpVariable %inData_ptr IncomingRayPayloadKHR
+%main = OpFunction %void None %func
+%label = OpLabel
+OpReturn
+OpFunctionEnd
+)";
+
+  CompileSuccessfully(body.c_str(), SPV_ENV_VULKAN_1_2);
+  EXPECT_EQ(SPV_ERROR_INVALID_DATA,
+            ValidateAndRetrieveValidationState(SPV_ENV_VULKAN_1_2));
+  EXPECT_THAT(getDiagnosticString(),
+              AnyVUID("VUID-StandaloneSpirv-IncomingRayPayloadKHR-04700"));
+  EXPECT_THAT(
+      getDiagnosticString(),
+      HasSubstr("Entry-point has more than one variable with the "
+                "IncomingRayPayloadKHR storage class in the interface"));
+}
+
+TEST_F(ValidateRayTracing, InterfaceHitAttribute) {
+  const std::string body = R"(
+OpCapability RayTracingKHR
+OpExtension "SPV_KHR_ray_tracing"
+OpMemoryModel Logical GLSL450
+OpEntryPoint CallableKHR %main "main" %inData1 %inData2
+OpName %main "main"
+%void = OpTypeVoid
+%func = OpTypeFunction %void
+%int = OpTypeInt 32 1
+%inData_ptr = OpTypePointer HitAttributeKHR %int
+%inData1 = OpVariable %inData_ptr HitAttributeKHR
+%inData2 = OpVariable %inData_ptr HitAttributeKHR
+%main = OpFunction %void None %func
+%label = OpLabel
+OpReturn
+OpFunctionEnd
+)";
+
+  CompileSuccessfully(body.c_str(), SPV_ENV_VULKAN_1_2);
+  EXPECT_EQ(SPV_ERROR_INVALID_DATA,
+            ValidateAndRetrieveValidationState(SPV_ENV_VULKAN_1_2));
+  EXPECT_THAT(getDiagnosticString(),
+              AnyVUID("VUID-StandaloneSpirv-HitAttributeKHR-04702"));
+  EXPECT_THAT(getDiagnosticString(),
+              HasSubstr("Entry-point has more than one variable with the "
+                        "HitAttributeKHR storage class in the interface"));
+}
+
+TEST_F(ValidateRayTracing, InterfaceIncomingCallableData) {
+  const std::string body = R"(
+OpCapability RayTracingKHR
+OpExtension "SPV_KHR_ray_tracing"
+OpMemoryModel Logical GLSL450
+OpEntryPoint CallableKHR %main "main" %inData1 %inData2
+OpName %main "main"
+%void = OpTypeVoid
+%func = OpTypeFunction %void
+%int = OpTypeInt 32 1
+%inData_ptr = OpTypePointer IncomingCallableDataKHR %int
+%inData1 = OpVariable %inData_ptr IncomingCallableDataKHR
+%inData2 = OpVariable %inData_ptr IncomingCallableDataKHR
+%main = OpFunction %void None %func
+%label = OpLabel
+OpReturn
+OpFunctionEnd
+)";
+
+  CompileSuccessfully(body.c_str(), SPV_ENV_VULKAN_1_2);
+  EXPECT_EQ(SPV_ERROR_INVALID_DATA,
+            ValidateAndRetrieveValidationState(SPV_ENV_VULKAN_1_2));
+  EXPECT_THAT(getDiagnosticString(),
+              AnyVUID("VUID-StandaloneSpirv-IncomingCallableDataKHR-04706"));
+  EXPECT_THAT(
+      getDiagnosticString(),
+      HasSubstr("Entry-point has more than one variable with the "
+                "IncomingCallableDataKHR storage class in the interface"));
+}
+
 }  // namespace
 }  // namespace val
 }  // namespace spvtools
diff --git a/third_party/vulkan-deps/vulkan-headers/src/cmake/install.cmake b/third_party/vulkan-deps/vulkan-headers/src/cmake/install.cmake
index 047df01..c19b5e7 100644
--- a/third_party/vulkan-deps/vulkan-headers/src/cmake/install.cmake
+++ b/third_party/vulkan-deps/vulkan-headers/src/cmake/install.cmake
@@ -26,7 +26,7 @@
 
 set(export_name "VulkanHeadersConfig")
 set(namespace "Vulkan::")
-set(cmake_files_install_dir ${CMAKE_INSTALL_DATADIR}/cmake/VulkanHeaders/)
+set(cmake_files_install_dir ${CMAKE_INSTALL_LIBDIR}/cmake/VulkanHeaders/)
 
 # Set EXPORT_NAME for consistency with established names. The CMake generated ones won't work.
 set_target_properties(Vulkan-Headers PROPERTIES EXPORT_NAME "Headers")
diff --git a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan.hpp b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan.hpp
index 81eb1b6..e73318a 100644
--- a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan.hpp
+++ b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan.hpp
@@ -114,7 +114,7 @@
 #  include <span>
 #endif
 
-static_assert( VK_HEADER_VERSION == 236, "Wrong VK_HEADER_VERSION!" );
+static_assert( VK_HEADER_VERSION == 235, "Wrong VK_HEADER_VERSION!" );
 
 // 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
@@ -12010,16 +12010,6 @@
     };
   };
 
-  //=== VK_LUNARG_direct_driver_loading ===
-  template <>
-  struct StructExtends<DirectDriverLoadingListLUNARG, InstanceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_EXT_shader_module_identifier ===
   template <>
   struct StructExtends<PhysicalDeviceShaderModuleIdentifierFeaturesEXT, PhysicalDeviceFeatures2>
@@ -12202,24 +12192,6 @@
     };
   };
 
-  //=== VK_QCOM_multiview_per_view_viewports ===
-  template <>
-  struct StructExtends<PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-  template <>
-  struct StructExtends<PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_NV_ray_tracing_invocation_reorder ===
   template <>
   struct StructExtends<PhysicalDeviceRayTracingInvocationReorderPropertiesNV, PhysicalDeviceProperties2>
diff --git a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_beta.h b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_beta.h
index b6c8e99..db51102 100644
--- a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_beta.h
+++ b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_beta.h
@@ -958,7 +958,7 @@
 
 #define VK_EXT_video_decode_h265 1
 #include "vk_video/vulkan_video_codec_h265std_decode.h"
-#define VK_EXT_VIDEO_DECODE_H265_SPEC_VERSION 6
+#define VK_EXT_VIDEO_DECODE_H265_SPEC_VERSION 5
 #define VK_EXT_VIDEO_DECODE_H265_EXTENSION_NAME "VK_EXT_video_decode_h265"
 typedef struct VkVideoDecodeH265ProfileInfoEXT {
     VkStructureType           sType;
@@ -996,8 +996,8 @@
     VkStructureType                   sType;
     const void*                       pNext;
     StdVideoDecodeH265PictureInfo*    pStdPictureInfo;
-    uint32_t                          sliceSegmentCount;
-    const uint32_t*                   pSliceSegmentOffsets;
+    uint32_t                          sliceCount;
+    const uint32_t*                   pSliceOffsets;
 } VkVideoDecodeH265PictureInfoEXT;
 
 typedef struct VkVideoDecodeH265DpbSlotInfoEXT {
diff --git a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_core.h b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_core.h
index fa7b8c9..b9c5e25 100644
--- a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_core.h
+++ b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_core.h
@@ -72,7 +72,7 @@
 #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 236
+#define VK_HEADER_VERSION 235
 
 // Complete version of this file
 #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 3, VK_HEADER_VERSION)
@@ -1039,8 +1039,6 @@
     VK_STRUCTURE_TYPE_RENDER_PASS_CREATION_CONTROL_EXT = 1000458001,
     VK_STRUCTURE_TYPE_RENDER_PASS_CREATION_FEEDBACK_CREATE_INFO_EXT = 1000458002,
     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_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,
@@ -1059,7 +1057,6 @@
     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_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_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT = 1000351000,
@@ -13670,7 +13667,7 @@
     const VkDescriptorAddressInfoEXT*    pStorageTexelBuffer;
     const VkDescriptorAddressInfoEXT*    pUniformBuffer;
     const VkDescriptorAddressInfoEXT*    pStorageBuffer;
-    VkDeviceAddress                      accelerationStructure;
+     VkDeviceAddress                     accelerationStructure;
 } VkDescriptorDataEXT;
 
 typedef struct VkDescriptorGetInfoEXT {
@@ -14246,6 +14243,24 @@
 
 
 
+#define VK_NV_acquire_winrt_display 1
+#define VK_NV_ACQUIRE_WINRT_DISPLAY_SPEC_VERSION 1
+#define VK_NV_ACQUIRE_WINRT_DISPLAY_EXTENSION_NAME "VK_NV_acquire_winrt_display"
+typedef VkResult (VKAPI_PTR *PFN_vkAcquireWinrtDisplayNV)(VkPhysicalDevice physicalDevice, VkDisplayKHR display);
+typedef VkResult (VKAPI_PTR *PFN_vkGetWinrtDisplayNV)(VkPhysicalDevice physicalDevice, uint32_t deviceRelativeId, VkDisplayKHR* pDisplay);
+
+#ifndef VK_NO_PROTOTYPES
+VKAPI_ATTR VkResult VKAPI_CALL vkAcquireWinrtDisplayNV(
+    VkPhysicalDevice                            physicalDevice,
+    VkDisplayKHR                                display);
+
+VKAPI_ATTR VkResult VKAPI_CALL vkGetWinrtDisplayNV(
+    VkPhysicalDevice                            physicalDevice,
+    uint32_t                                    deviceRelativeId,
+    VkDisplayKHR*                               pDisplay);
+#endif
+
+
 #define VK_VALVE_mutable_descriptor_type 1
 #define VK_VALVE_MUTABLE_DESCRIPTOR_TYPE_SPEC_VERSION 1
 #define VK_VALVE_MUTABLE_DESCRIPTOR_TYPE_EXTENSION_NAME "VK_VALVE_mutable_descriptor_type"
@@ -15532,36 +15547,6 @@
 
 
 
-#define VK_LUNARG_direct_driver_loading 1
-#define VK_LUNARG_DIRECT_DRIVER_LOADING_SPEC_VERSION 1
-#define VK_LUNARG_DIRECT_DRIVER_LOADING_EXTENSION_NAME "VK_LUNARG_direct_driver_loading"
-
-typedef enum VkDirectDriverLoadingModeLUNARG {
-    VK_DIRECT_DRIVER_LOADING_MODE_EXCLUSIVE_LUNARG = 0,
-    VK_DIRECT_DRIVER_LOADING_MODE_INCLUSIVE_LUNARG = 1,
-    VK_DIRECT_DRIVER_LOADING_MODE_MAX_ENUM_LUNARG = 0x7FFFFFFF
-} VkDirectDriverLoadingModeLUNARG;
-typedef VkFlags VkDirectDriverLoadingFlagsLUNARG;
-typedef PFN_vkVoidFunction (VKAPI_PTR *PFN_vkGetInstanceProcAddr)(
-    VkInstance instance, const char* pName);
-
-typedef struct VkDirectDriverLoadingInfoLUNARG {
-    VkStructureType                     sType;
-    void*                               pNext;
-    VkDirectDriverLoadingFlagsLUNARG    flags;
-    PFN_vkGetInstanceProcAddr           pfnGetInstanceProcAddr;
-} VkDirectDriverLoadingInfoLUNARG;
-
-typedef struct VkDirectDriverLoadingListLUNARG {
-    VkStructureType                           sType;
-    void*                                     pNext;
-    VkDirectDriverLoadingModeLUNARG           mode;
-    uint32_t                                  driverCount;
-    const VkDirectDriverLoadingInfoLUNARG*    pDrivers;
-} VkDirectDriverLoadingListLUNARG;
-
-
-
 #define VK_EXT_shader_module_identifier 1
 #define VK_MAX_SHADER_MODULE_IDENTIFIER_SIZE_EXT 32U
 #define VK_EXT_SHADER_MODULE_IDENTIFIER_SPEC_VERSION 1
@@ -15851,17 +15836,6 @@
 
 
 
-#define VK_QCOM_multiview_per_view_viewports 1
-#define VK_QCOM_MULTIVIEW_PER_VIEW_VIEWPORTS_SPEC_VERSION 1
-#define VK_QCOM_MULTIVIEW_PER_VIEW_VIEWPORTS_EXTENSION_NAME "VK_QCOM_multiview_per_view_viewports"
-typedef struct VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           multiviewPerViewViewports;
-} VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM;
-
-
-
 #define VK_NV_ray_tracing_invocation_reorder 1
 #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"
diff --git a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_enums.hpp b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_enums.hpp
index a7a9319..187129e 100644
--- a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_enums.hpp
+++ b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_enums.hpp
@@ -849,8 +849,6 @@
     eRenderPassCreationControlEXT                                = VK_STRUCTURE_TYPE_RENDER_PASS_CREATION_CONTROL_EXT,
     eRenderPassCreationFeedbackCreateInfoEXT                     = VK_STRUCTURE_TYPE_RENDER_PASS_CREATION_FEEDBACK_CREATE_INFO_EXT,
     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,
     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,
@@ -869,7 +867,6 @@
     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,
     ePhysicalDeviceMutableDescriptorTypeFeaturesEXT              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT,
@@ -6276,27 +6273,6 @@
     eNotMergedUnspecified                 = VK_SUBPASS_MERGE_STATUS_NOT_MERGED_UNSPECIFIED_EXT
   };
 
-  //=== VK_LUNARG_direct_driver_loading ===
-
-  enum class DirectDriverLoadingModeLUNARG
-  {
-    eExclusive = VK_DIRECT_DRIVER_LOADING_MODE_EXCLUSIVE_LUNARG,
-    eInclusive = VK_DIRECT_DRIVER_LOADING_MODE_INCLUSIVE_LUNARG
-  };
-
-  enum class DirectDriverLoadingFlagBitsLUNARG : VkDirectDriverLoadingFlagsLUNARG
-  {
-  };
-
-  using DirectDriverLoadingFlagsLUNARG = Flags<DirectDriverLoadingFlagBitsLUNARG>;
-
-  template <>
-  struct FlagTraits<DirectDriverLoadingFlagBitsLUNARG>
-  {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                           isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DirectDriverLoadingFlagsLUNARG allFlags  = {};
-  };
-
   //=== VK_EXT_rasterization_order_attachment_access ===
 
   enum class PipelineColorBlendStateCreateFlagBits : VkPipelineColorBlendStateCreateFlags
diff --git a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_format_traits.hpp b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_format_traits.hpp
index 700dee4..82bafce 100644
--- a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_format_traits.hpp
+++ b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_format_traits.hpp
@@ -16,100 +16,6 @@
   //=== Format Traits ===
   //=====================
 
-  // The three-dimensional extent of a texel block.
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 std::array<uint8_t, 3> blockExtent( VULKAN_HPP_NAMESPACE::Format format )
-  {
-    switch ( format )
-    {
-      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( VULKAN_HPP_NAMESPACE::Format format )
   {
@@ -367,260 +273,592 @@
     }
   }
 
-  // The class of the format (can't be just named "class"!)
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 char const * compatibilityClass( VULKAN_HPP_NAMESPACE::Format format )
+  // The number of texels in a texel block.
+  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 uint8_t texelsPerBlock( VULKAN_HPP_NAMESPACE::Format format )
   {
     switch ( format )
     {
-      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::eR16G16S105NV: return "32-bit";
+      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::eR16G16S105NV: return 1;
 
-      default: VULKAN_HPP_ASSERT( false ); return "";
+      default: VULKAN_HPP_ASSERT( false ); return 0;
+    }
+  }
+
+  // The three-dimensional extent of a texel block.
+  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 std::array<uint8_t, 3> blockExtent( VULKAN_HPP_NAMESPACE::Format format )
+  {
+    switch ( format )
+    {
+      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 } };
+    }
+  }
+
+  // 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( VULKAN_HPP_NAMESPACE::Format format )
+  {
+    switch ( format )
+    {
+      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 "";
+    }
+  }
+
+  // True, if this format is a compressed one.
+  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 bool isCompressed( VULKAN_HPP_NAMESPACE::Format format )
+  {
+    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( VULKAN_HPP_NAMESPACE::Format format )
+  {
+    switch ( format )
+    {
+      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;
+
+      default: return 0;
+    }
+  }
+
+  // True, if the components of this format are compressed, otherwise false.
+  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 bool componentsAreCompressed( VULKAN_HPP_NAMESPACE::Format format )
+  {
+    switch ( format )
+    {
+      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;
     }
   }
 
@@ -6511,241 +6749,37 @@
     }
   }
 
-  // True, if the components of this format are compressed, otherwise false.
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 bool componentsAreCompressed( VULKAN_HPP_NAMESPACE::Format format )
+  // The number of image planes of this format.
+  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 uint8_t planeCount( VULKAN_HPP_NAMESPACE::Format format )
   {
     switch ( format )
     {
-      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;
-    }
-  }
+      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;
 
-  // 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( VULKAN_HPP_NAMESPACE::Format format )
-  {
-    switch ( format )
-    {
-      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 "";
-    }
-  }
-
-  // True, if this format is a compressed one.
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 bool isCompressed( VULKAN_HPP_NAMESPACE::Format format )
-  {
-    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( VULKAN_HPP_NAMESPACE::Format format )
-  {
-    switch ( format )
-    {
-      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;
-
-      default: return 0;
+      default: return 1;
     }
   }
 
@@ -6939,40 +6973,6 @@
     }
   }
 
-  // The number of image planes of this format.
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 uint8_t planeCount( VULKAN_HPP_NAMESPACE::Format format )
-  {
-    switch ( format )
-    {
-      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( VULKAN_HPP_NAMESPACE::Format format, uint8_t plane )
   {
@@ -7353,262 +7353,5 @@
     }
   }
 
-  // The number of texels in a texel block.
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 uint8_t texelsPerBlock( VULKAN_HPP_NAMESPACE::Format format )
-  {
-    switch ( format )
-    {
-      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::eR16G16S105NV: return 1;
-
-      default: VULKAN_HPP_ASSERT( false ); return 0;
-    }
-  }
-
 }  // namespace VULKAN_HPP_NAMESPACE
 #endif
diff --git a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_funcs.hpp b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_funcs.hpp
index a14f7d6..4a63594 100644
--- a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_funcs.hpp
+++ b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_funcs.hpp
@@ -62,8 +62,8 @@
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Instance::destroy( const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -81,7 +81,7 @@
     d.vkDestroyInstance( m_instance,
                          reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::enumeratePhysicalDevices( uint32_t *                             pPhysicalDeviceCount,
@@ -149,7 +149,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), physicalDevices );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void PhysicalDevice::getFeatures( VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures * pFeatures, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -170,7 +170,7 @@
 
     return features;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void PhysicalDevice::getFormatProperties( VULKAN_HPP_NAMESPACE::Format             format,
@@ -193,7 +193,7 @@
 
     return formatProperties;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getImageFormatProperties( VULKAN_HPP_NAMESPACE::Format                  format,
@@ -238,7 +238,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), imageFormatProperties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void PhysicalDevice::getProperties( VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties * pProperties,
@@ -260,7 +260,7 @@
 
     return properties;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void PhysicalDevice::getQueueFamilyProperties( uint32_t *                                    pQueueFamilyPropertyCount,
@@ -317,7 +317,7 @@
     }
     return queueFamilyProperties;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void PhysicalDevice::getMemoryProperties( VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties * pMemoryProperties,
@@ -339,7 +339,7 @@
 
     return memoryProperties;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE PFN_vkVoidFunction Instance::getProcAddr( const char * pName, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -358,7 +358,7 @@
 
     return result;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE PFN_vkVoidFunction Device::getProcAddr( const char * pName, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -377,7 +377,7 @@
 
     return result;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::createDevice( const VULKAN_HPP_NAMESPACE::DeviceCreateInfo *    pCreateInfo,
@@ -430,8 +430,8 @@
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -449,7 +449,7 @@
     d.vkDestroyDevice( m_device,
                        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result enumerateInstanceExtensionProperties( const char *                                pLayerName,
@@ -523,7 +523,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), properties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::enumerateDeviceExtensionProperties( const char *                                pLayerName,
@@ -597,7 +597,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), properties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result enumerateInstanceLayerProperties( uint32_t *                              pPropertyCount,
@@ -665,7 +665,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), properties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::enumerateDeviceLayerProperties( uint32_t *                              pPropertyCount,
@@ -733,7 +733,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), properties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void
@@ -755,7 +755,7 @@
 
     return queue;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Queue::submit( uint32_t                                 submitCount,
@@ -779,7 +779,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
   template <typename Dispatch>
@@ -874,8 +874,8 @@
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::freeMemory( VULKAN_HPP_NAMESPACE::DeviceMemory                memory,
@@ -898,7 +898,7 @@
                     static_cast<VkDeviceMemory>( memory ),
                     reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void( Device::free )( VULKAN_HPP_NAMESPACE::DeviceMemory                memory,
@@ -921,7 +921,7 @@
                     static_cast<VkDeviceMemory>( memory ),
                     reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::mapMemory( VULKAN_HPP_NAMESPACE::DeviceMemory   memory,
@@ -961,7 +961,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), pData );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::unmapMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -992,7 +992,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::invalidateMappedMemoryRanges( uint32_t                                        memoryRangeCount,
@@ -1017,7 +1017,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getMemoryCommitment( VULKAN_HPP_NAMESPACE::DeviceMemory memory,
@@ -1040,7 +1040,7 @@
 
     return committedMemoryInBytes;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
   template <typename Dispatch>
@@ -1115,7 +1115,7 @@
 
     return memoryRequirements;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getImageMemoryRequirements( VULKAN_HPP_NAMESPACE::Image                image,
@@ -1138,7 +1138,7 @@
 
     return memoryRequirements;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getImageSparseMemoryRequirements( VULKAN_HPP_NAMESPACE::Image                           image,
@@ -1205,7 +1205,7 @@
     }
     return sparseMemoryRequirements;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void PhysicalDevice::getSparseImageFormatProperties( VULKAN_HPP_NAMESPACE::Format                        format,
@@ -1310,7 +1310,7 @@
     }
     return properties;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Queue::bindSparse( uint32_t                                     bindInfoCount,
@@ -1336,7 +1336,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createFence( const VULKAN_HPP_NAMESPACE::FenceCreateInfo *     pCreateInfo,
@@ -1387,8 +1387,8 @@
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyFence( VULKAN_HPP_NAMESPACE::Fence                       fence,
@@ -1411,7 +1411,7 @@
                       static_cast<VkFence>( fence ),
                       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Fence                       fence,
@@ -1434,7 +1434,7 @@
                       static_cast<VkFence>( fence ),
                       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::resetFences( uint32_t                            fenceCount,
@@ -1457,7 +1457,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
   template <typename Dispatch>
@@ -1511,7 +1511,7 @@
 
     return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createSemaphore( const VULKAN_HPP_NAMESPACE::SemaphoreCreateInfo * pCreateInfo,
@@ -1567,8 +1567,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroySemaphore( VULKAN_HPP_NAMESPACE::Semaphore                   semaphore,
@@ -1591,7 +1591,7 @@
                           static_cast<VkSemaphore>( semaphore ),
                           reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Semaphore                   semaphore,
@@ -1614,7 +1614,7 @@
                           static_cast<VkSemaphore>( semaphore ),
                           reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createEvent( const VULKAN_HPP_NAMESPACE::EventCreateInfo *     pCreateInfo,
@@ -1665,8 +1665,8 @@
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  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,
@@ -1689,7 +1689,7 @@
                       static_cast<VkEvent>( event ),
                       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Event                       event,
@@ -1712,7 +1712,7 @@
                       static_cast<VkEvent>( event ),
                       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
   template <typename Dispatch>
@@ -1831,8 +1831,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyQueryPool( VULKAN_HPP_NAMESPACE::QueryPool                   queryPool,
@@ -1855,7 +1855,7 @@
                           static_cast<VkQueryPool>( queryPool ),
                           reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::QueryPool                   queryPool,
@@ -1878,7 +1878,7 @@
                           static_cast<VkQueryPool>( queryPool ),
                           reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getQueryPoolResults( VULKAN_HPP_NAMESPACE::QueryPool        queryPool,
@@ -1956,7 +1956,7 @@
 
     return ResultValue<DataType>( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), data );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createBuffer( const VULKAN_HPP_NAMESPACE::BufferCreateInfo *    pCreateInfo,
@@ -2007,8 +2007,8 @@
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyBuffer( VULKAN_HPP_NAMESPACE::Buffer                      buffer,
@@ -2031,7 +2031,7 @@
                        static_cast<VkBuffer>( buffer ),
                        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Buffer                      buffer,
@@ -2054,7 +2054,7 @@
                        static_cast<VkBuffer>( buffer ),
                        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createBufferView( const VULKAN_HPP_NAMESPACE::BufferViewCreateInfo * pCreateInfo,
@@ -2109,8 +2109,8 @@
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  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,
@@ -2133,7 +2133,7 @@
                            static_cast<VkBufferView>( bufferView ),
                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::BufferView                  bufferView,
@@ -2156,7 +2156,7 @@
                            static_cast<VkBufferView>( bufferView ),
                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createImage( const VULKAN_HPP_NAMESPACE::ImageCreateInfo *     pCreateInfo,
@@ -2207,8 +2207,8 @@
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyImage( VULKAN_HPP_NAMESPACE::Image                       image,
@@ -2231,7 +2231,7 @@
                       static_cast<VkImage>( image ),
                       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Image                       image,
@@ -2254,7 +2254,7 @@
                       static_cast<VkImage>( image ),
                       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getImageSubresourceLayout( VULKAN_HPP_NAMESPACE::Image                    image,
@@ -2284,7 +2284,7 @@
 
     return layout;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createImageView( const VULKAN_HPP_NAMESPACE::ImageViewCreateInfo * pCreateInfo,
@@ -2339,8 +2339,8 @@
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyImageView( VULKAN_HPP_NAMESPACE::ImageView                   imageView,
@@ -2363,7 +2363,7 @@
                           static_cast<VkImageView>( imageView ),
                           reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::ImageView                   imageView,
@@ -2386,7 +2386,7 @@
                           static_cast<VkImageView>( imageView ),
                           reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createShaderModule( const VULKAN_HPP_NAMESPACE::ShaderModuleCreateInfo * pCreateInfo,
@@ -2442,8 +2442,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyShaderModule( VULKAN_HPP_NAMESPACE::ShaderModule                shaderModule,
@@ -2466,7 +2466,7 @@
                              static_cast<VkShaderModule>( shaderModule ),
                              reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::ShaderModule                shaderModule,
@@ -2489,7 +2489,7 @@
                              static_cast<VkShaderModule>( shaderModule ),
                              reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createPipelineCache( const VULKAN_HPP_NAMESPACE::PipelineCacheCreateInfo * pCreateInfo,
@@ -2545,8 +2545,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyPipelineCache( VULKAN_HPP_NAMESPACE::PipelineCache               pipelineCache,
@@ -2569,7 +2569,7 @@
                               static_cast<VkPipelineCache>( pipelineCache ),
                               reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::PipelineCache               pipelineCache,
@@ -2592,7 +2592,7 @@
                               static_cast<VkPipelineCache>( pipelineCache ),
                               reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getPipelineCacheData( VULKAN_HPP_NAMESPACE::PipelineCache pipelineCache,
@@ -2661,7 +2661,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), data );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::mergePipelineCaches( VULKAN_HPP_NAMESPACE::PipelineCache         dstCache,
@@ -2689,7 +2689,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createGraphicsPipelines( VULKAN_HPP_NAMESPACE::PipelineCache                      pipelineCache,
@@ -2877,8 +2877,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  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,
@@ -3066,8 +3066,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyPipeline( VULKAN_HPP_NAMESPACE::Pipeline                    pipeline,
@@ -3090,7 +3090,7 @@
                          static_cast<VkPipeline>( pipeline ),
                          reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Pipeline                    pipeline,
@@ -3113,7 +3113,7 @@
                          static_cast<VkPipeline>( pipeline ),
                          reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createPipelineLayout( const VULKAN_HPP_NAMESPACE::PipelineLayoutCreateInfo * pCreateInfo,
@@ -3169,8 +3169,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyPipelineLayout( VULKAN_HPP_NAMESPACE::PipelineLayout              pipelineLayout,
@@ -3193,7 +3193,7 @@
                                static_cast<VkPipelineLayout>( pipelineLayout ),
                                reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::PipelineLayout              pipelineLayout,
@@ -3216,7 +3216,7 @@
                                static_cast<VkPipelineLayout>( pipelineLayout ),
                                reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createSampler( const VULKAN_HPP_NAMESPACE::SamplerCreateInfo *   pCreateInfo,
@@ -3267,8 +3267,8 @@
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroySampler( VULKAN_HPP_NAMESPACE::Sampler                     sampler,
@@ -3291,7 +3291,7 @@
                         static_cast<VkSampler>( sampler ),
                         reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Sampler                     sampler,
@@ -3314,7 +3314,7 @@
                         static_cast<VkSampler>( sampler ),
                         reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createDescriptorSetLayout( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo * pCreateInfo,
@@ -3370,8 +3370,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyDescriptorSetLayout( VULKAN_HPP_NAMESPACE::DescriptorSetLayout         descriptorSetLayout,
@@ -3396,7 +3396,7 @@
       static_cast<VkDescriptorSetLayout>( descriptorSetLayout ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::DescriptorSetLayout         descriptorSetLayout,
@@ -3421,7 +3421,7 @@
       static_cast<VkDescriptorSetLayout>( descriptorSetLayout ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createDescriptorPool( const VULKAN_HPP_NAMESPACE::DescriptorPoolCreateInfo * pCreateInfo,
@@ -3477,8 +3477,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyDescriptorPool( VULKAN_HPP_NAMESPACE::DescriptorPool              descriptorPool,
@@ -3501,7 +3501,7 @@
                                static_cast<VkDescriptorPool>( descriptorPool ),
                                reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::DescriptorPool              descriptorPool,
@@ -3524,7 +3524,7 @@
                                static_cast<VkDescriptorPool>( descriptorPool ),
                                reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
   template <typename Dispatch>
@@ -3639,8 +3639,8 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), std::move( uniqueDescriptorSets ) );
   }
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE Result Device::freeDescriptorSets( VULKAN_HPP_NAMESPACE::DescriptorPool        descriptorPool,
@@ -3664,7 +3664,7 @@
     d.vkFreeDescriptorSets(
       m_device, static_cast<VkDescriptorPool>( descriptorPool ), descriptorSets.size(), reinterpret_cast<const VkDescriptorSet *>( descriptorSets.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE Result( Device::free )( VULKAN_HPP_NAMESPACE::DescriptorPool        descriptorPool,
@@ -3688,7 +3688,7 @@
     d.vkFreeDescriptorSets(
       m_device, static_cast<VkDescriptorPool>( descriptorPool ), descriptorSets.size(), reinterpret_cast<const VkDescriptorSet *>( descriptorSets.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::updateDescriptorSets( uint32_t                                         descriptorWriteCount,
@@ -3720,7 +3720,7 @@
                               descriptorCopies.size(),
                               reinterpret_cast<const VkCopyDescriptorSet *>( descriptorCopies.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createFramebuffer( const VULKAN_HPP_NAMESPACE::FramebufferCreateInfo * pCreateInfo,
@@ -3776,8 +3776,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  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,
@@ -3800,7 +3800,7 @@
                             static_cast<VkFramebuffer>( framebuffer ),
                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Framebuffer                 framebuffer,
@@ -3823,7 +3823,7 @@
                             static_cast<VkFramebuffer>( framebuffer ),
                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createRenderPass( const VULKAN_HPP_NAMESPACE::RenderPassCreateInfo * pCreateInfo,
@@ -3879,8 +3879,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  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,
@@ -3903,7 +3903,7 @@
                            static_cast<VkRenderPass>( renderPass ),
                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::RenderPass                  renderPass,
@@ -3926,7 +3926,7 @@
                            static_cast<VkRenderPass>( renderPass ),
                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getRenderAreaGranularity( VULKAN_HPP_NAMESPACE::RenderPass renderPass,
@@ -3949,7 +3949,7 @@
 
     return granularity;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createCommandPool( const VULKAN_HPP_NAMESPACE::CommandPoolCreateInfo * pCreateInfo,
@@ -4005,8 +4005,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  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,
@@ -4029,7 +4029,7 @@
                             static_cast<VkCommandPool>( commandPool ),
                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::CommandPool                 commandPool,
@@ -4052,7 +4052,7 @@
                             static_cast<VkCommandPool>( commandPool ),
                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
   template <typename Dispatch>
@@ -4168,8 +4168,8 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), std::move( uniqueCommandBuffers ) );
   }
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  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,
@@ -4193,7 +4193,7 @@
     d.vkFreeCommandBuffers(
       m_device, static_cast<VkCommandPool>( commandPool ), commandBuffers.size(), reinterpret_cast<const VkCommandBuffer *>( commandBuffers.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void( Device::free )( VULKAN_HPP_NAMESPACE::CommandPool           commandPool,
@@ -4217,7 +4217,7 @@
     d.vkFreeCommandBuffers(
       m_device, static_cast<VkCommandPool>( commandPool ), commandBuffers.size(), reinterpret_cast<const VkCommandBuffer *>( commandBuffers.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result CommandBuffer::begin( const VULKAN_HPP_NAMESPACE::CommandBufferBeginInfo * pBeginInfo,
@@ -4239,7 +4239,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
   template <typename Dispatch>
@@ -4311,7 +4311,7 @@
 
     d.vkCmdSetViewport( m_commandBuffer, firstViewport, viewports.size(), reinterpret_cast<const VkViewport *>( viewports.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setScissor( uint32_t                             firstScissor,
@@ -4333,7 +4333,7 @@
 
     d.vkCmdSetScissor( m_commandBuffer, firstScissor, scissors.size(), reinterpret_cast<const VkRect2D *>( scissors.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setLineWidth( float lineWidth, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -4429,7 +4429,7 @@
                                dynamicOffsets.size(),
                                dynamicOffsets.data() );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::bindIndexBuffer( VULKAN_HPP_NAMESPACE::Buffer     buffer,
@@ -4476,7 +4476,7 @@
                               reinterpret_cast<const VkBuffer *>( buffers.data() ),
                               reinterpret_cast<const VkDeviceSize *>( offsets.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::draw(
@@ -4567,7 +4567,7 @@
                        regions.size(),
                        reinterpret_cast<const VkBufferCopy *>( regions.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::copyImage( VULKAN_HPP_NAMESPACE::Image             srcImage,
@@ -4607,7 +4607,7 @@
                       regions.size(),
                       reinterpret_cast<const VkImageCopy *>( regions.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::blitImage( VULKAN_HPP_NAMESPACE::Image             srcImage,
@@ -4651,7 +4651,7 @@
                       reinterpret_cast<const VkImageBlit *>( regions.data() ),
                       static_cast<VkFilter>( filter ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::copyBufferToImage( VULKAN_HPP_NAMESPACE::Buffer                  srcBuffer,
@@ -4687,7 +4687,7 @@
                               regions.size(),
                               reinterpret_cast<const VkBufferImageCopy *>( regions.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::copyImageToBuffer( VULKAN_HPP_NAMESPACE::Image                   srcImage,
@@ -4723,7 +4723,7 @@
                               regions.size(),
                               reinterpret_cast<const VkBufferImageCopy *>( regions.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::updateBuffer( VULKAN_HPP_NAMESPACE::Buffer     dstBuffer,
@@ -4752,7 +4752,7 @@
                          data.size() * sizeof( DataType ),
                          reinterpret_cast<const void *>( data.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::fillBuffer( VULKAN_HPP_NAMESPACE::Buffer     dstBuffer,
@@ -4799,7 +4799,7 @@
                             ranges.size(),
                             reinterpret_cast<const VkImageSubresourceRange *>( ranges.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::clearDepthStencilImage( VULKAN_HPP_NAMESPACE::Image                          image,
@@ -4836,7 +4836,7 @@
                                    ranges.size(),
                                    reinterpret_cast<const VkImageSubresourceRange *>( ranges.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::clearAttachments( uint32_t                                      attachmentCount,
@@ -4867,7 +4867,7 @@
                              rects.size(),
                              reinterpret_cast<const VkClearRect *>( rects.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::resolveImage( VULKAN_HPP_NAMESPACE::Image                srcImage,
@@ -4907,7 +4907,7 @@
                          regions.size(),
                          reinterpret_cast<const VkImageResolve *>( regions.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setEvent( VULKAN_HPP_NAMESPACE::Event              event,
@@ -4979,7 +4979,7 @@
                        imageMemoryBarriers.size(),
                        reinterpret_cast<const VkImageMemoryBarrier *>( imageMemoryBarriers.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::pipelineBarrier( VULKAN_HPP_NAMESPACE::PipelineStageFlags          srcStageMask,
@@ -5030,7 +5030,7 @@
                             imageMemoryBarriers.size(),
                             reinterpret_cast<const VkImageMemoryBarrier *>( imageMemoryBarriers.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::beginQuery( VULKAN_HPP_NAMESPACE::QueryPool         queryPool,
@@ -5119,7 +5119,7 @@
                           values.size() * sizeof( ValuesType ),
                           reinterpret_cast<const void *>( values.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::beginRenderPass( const VULKAN_HPP_NAMESPACE::RenderPassBeginInfo * pRenderPassBegin,
@@ -5140,7 +5140,7 @@
 
     d.vkCmdBeginRenderPass( m_commandBuffer, reinterpret_cast<const VkRenderPassBeginInfo *>( &renderPassBegin ), static_cast<VkSubpassContents>( contents ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::nextSubpass( VULKAN_HPP_NAMESPACE::SubpassContents contents, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -5174,7 +5174,7 @@
 
     d.vkCmdExecuteCommands( m_commandBuffer, commandBuffers.size(), reinterpret_cast<const VkCommandBuffer *>( commandBuffers.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_VERSION_1_1 ===
 
@@ -5197,7 +5197,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), apiVersion );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::bindBufferMemory2( uint32_t                                           bindInfoCount,
@@ -5220,7 +5220,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::bindImageMemory2( uint32_t                                          bindInfoCount,
@@ -5243,7 +5243,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getGroupPeerMemoryFeatures( uint32_t                                       heapIndex,
@@ -5270,7 +5270,7 @@
 
     return peerMemoryFeatures;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setDeviceMask( uint32_t deviceMask, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -5365,7 +5365,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), physicalDeviceGroupProperties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getImageMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 * pInfo,
@@ -5404,7 +5404,7 @@
 
     return structureChain;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getBufferMemoryRequirements2( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 * pInfo,
@@ -5443,7 +5443,7 @@
 
     return structureChain;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getImageSparseMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 * pInfo,
@@ -5512,7 +5512,7 @@
     }
     return sparseMemoryRequirements;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#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
@@ -5545,7 +5545,7 @@
 
     return structureChain;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void PhysicalDevice::getProperties2( VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 * pProperties,
@@ -5579,7 +5579,7 @@
 
     return structureChain;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void PhysicalDevice::getFormatProperties2( VULKAN_HPP_NAMESPACE::Format              format,
@@ -5615,7 +5615,7 @@
 
     return structureChain;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -5660,7 +5660,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), structureChain );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void PhysicalDevice::getQueueFamilyProperties2( uint32_t *                                     pQueueFamilyPropertyCount,
@@ -5783,7 +5783,7 @@
     }
     return structureChains;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void PhysicalDevice::getMemoryProperties2( VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2 * pMemoryProperties,
@@ -5818,7 +5818,7 @@
 
     return structureChain;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void PhysicalDevice::getSparseImageFormatProperties2( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 * pFormatInfo,
@@ -5886,7 +5886,7 @@
     }
     return properties;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::trimCommandPool( VULKAN_HPP_NAMESPACE::CommandPool          commandPool,
@@ -5918,7 +5918,7 @@
 
     return queue;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -5975,8 +5975,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  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,
@@ -6001,7 +6001,7 @@
       static_cast<VkSamplerYcbcrConversion>( ycbcrConversion ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion      ycbcrConversion,
@@ -6026,7 +6026,7 @@
       static_cast<VkSamplerYcbcrConversion>( ycbcrConversion ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -6083,8 +6083,8 @@
                                   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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyDescriptorUpdateTemplate( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate    descriptorUpdateTemplate,
@@ -6109,7 +6109,7 @@
       static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate    descriptorUpdateTemplate,
@@ -6134,7 +6134,7 @@
       static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::updateDescriptorSetWithTemplate( VULKAN_HPP_NAMESPACE::DescriptorSet            descriptorSet,
@@ -6161,7 +6161,7 @@
                                          static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ),
                                          reinterpret_cast<const void *>( &data ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void PhysicalDevice::getExternalBufferProperties( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalBufferInfo * pExternalBufferInfo,
@@ -6189,7 +6189,7 @@
 
     return externalBufferProperties;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void PhysicalDevice::getExternalFenceProperties( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalFenceInfo * pExternalFenceInfo,
@@ -6217,7 +6217,7 @@
 
     return externalFenceProperties;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void
@@ -6246,7 +6246,7 @@
 
     return externalSemaphoreProperties;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getDescriptorSetLayoutSupport( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo * pCreateInfo,
@@ -6287,7 +6287,7 @@
 
     return structureChain;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_VERSION_1_2 ===
 
@@ -6383,8 +6383,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::beginRenderPass2( const VULKAN_HPP_NAMESPACE::RenderPassBeginInfo * pRenderPassBegin,
@@ -6407,7 +6407,7 @@
     d.vkCmdBeginRenderPass2(
       m_commandBuffer, reinterpret_cast<const VkRenderPassBeginInfo *>( &renderPassBegin ), reinterpret_cast<const VkSubpassBeginInfo *>( &subpassBeginInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::nextSubpass2( const VULKAN_HPP_NAMESPACE::SubpassBeginInfo * pSubpassBeginInfo,
@@ -6430,7 +6430,7 @@
     d.vkCmdNextSubpass2(
       m_commandBuffer, reinterpret_cast<const VkSubpassBeginInfo *>( &subpassBeginInfo ), reinterpret_cast<const VkSubpassEndInfo *>( &subpassEndInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::endRenderPass2( const VULKAN_HPP_NAMESPACE::SubpassEndInfo * pSubpassEndInfo,
@@ -6449,7 +6449,7 @@
 
     d.vkCmdEndRenderPass2( m_commandBuffer, reinterpret_cast<const VkSubpassEndInfo *>( &subpassEndInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void
@@ -6481,7 +6481,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), value );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::waitSemaphores( const VULKAN_HPP_NAMESPACE::SemaphoreWaitInfo * pWaitInfo,
@@ -6506,7 +6506,7 @@
 
     return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::signalSemaphore( const VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo * pSignalInfo,
@@ -6528,7 +6528,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE DeviceAddress Device::getBufferAddress( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo * pInfo,
@@ -6549,7 +6549,7 @@
 
     return static_cast<VULKAN_HPP_NAMESPACE::DeviceAddress>( result );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE uint64_t Device::getBufferOpaqueCaptureAddress( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo * pInfo,
@@ -6570,7 +6570,7 @@
 
     return result;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE uint64_t Device::getMemoryOpaqueCaptureAddress( const VULKAN_HPP_NAMESPACE::DeviceMemoryOpaqueCaptureAddressInfo * pInfo,
@@ -6591,7 +6591,7 @@
 
     return result;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_VERSION_1_3 ===
 
@@ -6667,7 +6667,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), toolProperties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createPrivateDataSlot( const VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateInfo * pCreateInfo,
@@ -6723,8 +6723,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyPrivateDataSlot( VULKAN_HPP_NAMESPACE::PrivateDataSlot             privateDataSlot,
@@ -6748,7 +6748,7 @@
       static_cast<VkPrivateDataSlot>( privateDataSlot ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::PrivateDataSlot             privateDataSlot,
@@ -6772,7 +6772,7 @@
       static_cast<VkPrivateDataSlot>( privateDataSlot ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
   template <typename Dispatch>
@@ -6829,7 +6829,7 @@
 
     return data;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setEvent2( VULKAN_HPP_NAMESPACE::Event                  event,
@@ -6850,7 +6850,7 @@
 
     d.vkCmdSetEvent2( m_commandBuffer, static_cast<VkEvent>( event ), reinterpret_cast<const VkDependencyInfo *>( &dependencyInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::resetEvent2( VULKAN_HPP_NAMESPACE::Event               event,
@@ -6893,7 +6893,7 @@
                         reinterpret_cast<const VkEvent *>( events.data() ),
                         reinterpret_cast<const VkDependencyInfo *>( dependencyInfos.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::pipelineBarrier2( const VULKAN_HPP_NAMESPACE::DependencyInfo * pDependencyInfo,
@@ -6912,7 +6912,7 @@
 
     d.vkCmdPipelineBarrier2( m_commandBuffer, reinterpret_cast<const VkDependencyInfo *>( &dependencyInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::writeTimestamp2( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stage,
@@ -6946,7 +6946,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::copyBuffer2( const VULKAN_HPP_NAMESPACE::CopyBufferInfo2 * pCopyBufferInfo,
@@ -6965,7 +6965,7 @@
 
     d.vkCmdCopyBuffer2( m_commandBuffer, reinterpret_cast<const VkCopyBufferInfo2 *>( &copyBufferInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#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
@@ -6982,7 +6982,7 @@
 
     d.vkCmdCopyImage2( m_commandBuffer, reinterpret_cast<const VkCopyImageInfo2 *>( &copyImageInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::copyBufferToImage2( const VULKAN_HPP_NAMESPACE::CopyBufferToImageInfo2 * pCopyBufferToImageInfo,
@@ -7001,7 +7001,7 @@
 
     d.vkCmdCopyBufferToImage2( m_commandBuffer, reinterpret_cast<const VkCopyBufferToImageInfo2 *>( &copyBufferToImageInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::copyImageToBuffer2( const VULKAN_HPP_NAMESPACE::CopyImageToBufferInfo2 * pCopyImageToBufferInfo,
@@ -7020,7 +7020,7 @@
 
     d.vkCmdCopyImageToBuffer2( m_commandBuffer, reinterpret_cast<const VkCopyImageToBufferInfo2 *>( &copyImageToBufferInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#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
@@ -7037,7 +7037,7 @@
 
     d.vkCmdBlitImage2( m_commandBuffer, reinterpret_cast<const VkBlitImageInfo2 *>( &blitImageInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::resolveImage2( const VULKAN_HPP_NAMESPACE::ResolveImageInfo2 * pResolveImageInfo,
@@ -7056,7 +7056,7 @@
 
     d.vkCmdResolveImage2( m_commandBuffer, reinterpret_cast<const VkResolveImageInfo2 *>( &resolveImageInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::beginRendering( const VULKAN_HPP_NAMESPACE::RenderingInfo * pRenderingInfo,
@@ -7075,7 +7075,7 @@
 
     d.vkCmdBeginRendering( m_commandBuffer, reinterpret_cast<const VkRenderingInfo *>( &renderingInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::endRendering( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -7124,7 +7124,7 @@
 
     d.vkCmdSetViewportWithCount( m_commandBuffer, viewports.size(), reinterpret_cast<const VkViewport *>( viewports.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void
@@ -7143,7 +7143,7 @@
 
     d.vkCmdSetScissorWithCount( m_commandBuffer, scissors.size(), reinterpret_cast<const VkRect2D *>( scissors.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::bindVertexBuffers2( uint32_t                                 firstBinding,
@@ -7201,7 +7201,7 @@
                                reinterpret_cast<const VkDeviceSize *>( sizes.data() ),
                                reinterpret_cast<const VkDeviceSize *>( strides.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setDepthTestEnable( VULKAN_HPP_NAMESPACE::Bool32 depthTestEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -7316,7 +7316,7 @@
 
     return structureChain;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getImageMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements * pInfo,
@@ -7355,7 +7355,7 @@
 
     return structureChain;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getImageSparseMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements * pInfo,
@@ -7424,7 +7424,7 @@
     }
     return sparseMemoryRequirements;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_surface ===
 
@@ -7449,7 +7449,7 @@
                            static_cast<VkSurfaceKHR>( surface ),
                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Instance::destroy( VULKAN_HPP_NAMESPACE::SurfaceKHR                  surface,
@@ -7472,7 +7472,7 @@
                            static_cast<VkSurfaceKHR>( surface ),
                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getSurfaceSupportKHR( uint32_t                         queueFamilyIndex,
@@ -7499,7 +7499,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), supported );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getSurfaceCapabilitiesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR               surface,
@@ -7525,7 +7525,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), surfaceCapabilities );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getSurfaceFormatsKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR         surface,
@@ -7599,7 +7599,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), surfaceFormats );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR       surface,
@@ -7673,7 +7673,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), presentModes );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_swapchain ===
 
@@ -7731,8 +7731,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroySwapchainKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR                swapchain,
@@ -7755,7 +7755,7 @@
                              static_cast<VkSwapchainKHR>( swapchain ),
                              reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::SwapchainKHR                swapchain,
@@ -7778,7 +7778,7 @@
                              static_cast<VkSwapchainKHR>( swapchain ),
                              reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSwapchainImagesKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain,
@@ -7847,7 +7847,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), swapchainImages );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::acquireNextImageKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain,
@@ -7884,7 +7884,7 @@
 
     return ResultValue<uint32_t>( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), imageIndex );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Queue::presentKHR( const VULKAN_HPP_NAMESPACE::PresentInfoKHR * pPresentInfo,
@@ -7908,7 +7908,7 @@
 
     return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getGroupPresentCapabilitiesKHR(
@@ -7933,7 +7933,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), deviceGroupPresentCapabilities );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getGroupSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR                       surface,
@@ -7959,7 +7959,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), modes );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getPresentRectanglesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface,
@@ -8028,7 +8028,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), rects );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::acquireNextImage2KHR( const VULKAN_HPP_NAMESPACE::AcquireNextImageInfoKHR * pAcquireInfo,
@@ -8057,7 +8057,7 @@
 
     return ResultValue<uint32_t>( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), imageIndex );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_display ===
 
@@ -8128,7 +8128,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), properties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getDisplayPlanePropertiesKHR( uint32_t *                                        pPropertyCount,
@@ -8201,7 +8201,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), properties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getDisplayPlaneSupportedDisplaysKHR( uint32_t                           planeIndex,
@@ -8271,7 +8271,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), displays );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getDisplayModePropertiesKHR( VULKAN_HPP_NAMESPACE::DisplayKHR                 display,
@@ -8347,7 +8347,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), properties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::createDisplayModeKHR( VULKAN_HPP_NAMESPACE::DisplayKHR                       display,
@@ -8409,8 +8409,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -8438,7 +8438,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), capabilities );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createDisplayPlaneSurfaceKHR( const VULKAN_HPP_NAMESPACE::DisplaySurfaceCreateInfoKHR * pCreateInfo,
@@ -8494,8 +8494,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_display_swapchain ===
 
@@ -8659,8 +8659,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_XLIB_KHR )
   //=== VK_KHR_xlib_surface ===
@@ -8719,8 +8719,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE Bool32
@@ -8741,7 +8741,7 @@
 
     return static_cast<VULKAN_HPP_NAMESPACE::Bool32>( result );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_XLIB_KHR*/
 
 #if defined( VK_USE_PLATFORM_XCB_KHR )
@@ -8801,8 +8801,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE Bool32 PhysicalDevice::getXcbPresentationSupportKHR( uint32_t           queueFamilyIndex,
@@ -8827,7 +8827,7 @@
 
     return static_cast<VULKAN_HPP_NAMESPACE::Bool32>( result );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_XCB_KHR*/
 
 #if defined( VK_USE_PLATFORM_WAYLAND_KHR )
@@ -8887,8 +8887,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE Bool32 PhysicalDevice::getWaylandPresentationSupportKHR( uint32_t            queueFamilyIndex,
@@ -8910,7 +8910,7 @@
 
     return static_cast<VULKAN_HPP_NAMESPACE::Bool32>( result );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_WAYLAND_KHR*/
 
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
@@ -8970,8 +8970,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_ANDROID_KHR*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
@@ -9031,8 +9031,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE Bool32 PhysicalDevice::getWin32PresentationSupportKHR( uint32_t queueFamilyIndex, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -9099,8 +9099,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Instance::destroyDebugReportCallbackEXT( VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT      callback,
@@ -9125,7 +9125,7 @@
       static_cast<VkDebugReportCallbackEXT>( callback ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Instance::destroy( VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT      callback,
@@ -9150,7 +9150,7 @@
       static_cast<VkDebugReportCallbackEXT>( callback ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Instance::debugReportMessageEXT( VULKAN_HPP_NAMESPACE::DebugReportFlagsEXT      flags,
@@ -9195,7 +9195,7 @@
                                layerPrefix.c_str(),
                                message.c_str() );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_EXT_debug_marker ===
 
@@ -9219,7 +9219,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::debugMarkerSetObjectNameEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerObjectNameInfoEXT * pNameInfo,
@@ -9241,7 +9241,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::debugMarkerBeginEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerMarkerInfoEXT * pMarkerInfo,
@@ -9260,7 +9260,7 @@
 
     d.vkCmdDebugMarkerBeginEXT( m_commandBuffer, reinterpret_cast<const VkDebugMarkerMarkerInfoEXT *>( &markerInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::debugMarkerEndEXT( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -9286,7 +9286,7 @@
 
     d.vkCmdDebugMarkerInsertEXT( m_commandBuffer, reinterpret_cast<const VkDebugMarkerMarkerInfoEXT *>( &markerInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
   //=== VK_KHR_video_queue ===
@@ -9330,7 +9330,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), structureChain );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -9415,7 +9415,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), videoFormatProperties );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createVideoSessionKHR( const VULKAN_HPP_NAMESPACE::VideoSessionCreateInfoKHR * pCreateInfo,
@@ -9471,8 +9471,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyVideoSessionKHR( VULKAN_HPP_NAMESPACE::VideoSessionKHR             videoSession,
@@ -9496,7 +9496,7 @@
       static_cast<VkVideoSessionKHR>( videoSession ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::VideoSessionKHR             videoSession,
@@ -9520,7 +9520,7 @@
       static_cast<VkVideoSessionKHR>( videoSession ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -9604,7 +9604,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), memoryRequirements );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -9637,7 +9637,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -9694,8 +9694,8 @@
                                   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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -9725,7 +9725,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyVideoSessionParametersKHR( VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR   videoSessionParameters,
@@ -9750,7 +9750,7 @@
       static_cast<VkVideoSessionParametersKHR>( videoSessionParameters ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR   videoSessionParameters,
@@ -9775,7 +9775,7 @@
       static_cast<VkVideoSessionParametersKHR>( videoSessionParameters ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::beginVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoBeginCodingInfoKHR * pBeginInfo,
@@ -9794,7 +9794,7 @@
 
     d.vkCmdBeginVideoCodingKHR( m_commandBuffer, reinterpret_cast<const VkVideoBeginCodingInfoKHR *>( &beginInfo ) );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::endVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoEndCodingInfoKHR * pEndCodingInfo,
@@ -9813,7 +9813,7 @@
 
     d.vkCmdEndVideoCodingKHR( m_commandBuffer, reinterpret_cast<const VkVideoEndCodingInfoKHR *>( &endCodingInfo ) );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::controlVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoCodingControlInfoKHR * pCodingControlInfo,
@@ -9832,7 +9832,7 @@
 
     d.vkCmdControlVideoCodingKHR( m_commandBuffer, reinterpret_cast<const VkVideoCodingControlInfoKHR *>( &codingControlInfo ) );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_ENABLE_BETA_EXTENSIONS*/
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
@@ -9855,7 +9855,7 @@
 
     d.vkCmdDecodeVideoKHR( m_commandBuffer, reinterpret_cast<const VkVideoDecodeInfoKHR *>( &decodeInfo ) );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_ENABLE_BETA_EXTENSIONS*/
 
   //=== VK_EXT_transform_feedback ===
@@ -9908,7 +9908,7 @@
                                             reinterpret_cast<const VkDeviceSize *>( offsets.data() ),
                                             reinterpret_cast<const VkDeviceSize *>( sizes.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::beginTransformFeedbackEXT( uint32_t                                 firstCounterBuffer,
@@ -9949,7 +9949,7 @@
                                       reinterpret_cast<const VkBuffer *>( counterBuffers.data() ),
                                       reinterpret_cast<const VkDeviceSize *>( counterBufferOffsets.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::endTransformFeedbackEXT( uint32_t                                 firstCounterBuffer,
@@ -9990,7 +9990,7 @@
                                     reinterpret_cast<const VkBuffer *>( counterBuffers.data() ),
                                     reinterpret_cast<const VkDeviceSize *>( counterBufferOffsets.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::beginQueryIndexedEXT( VULKAN_HPP_NAMESPACE::QueryPool         queryPool,
@@ -10085,8 +10085,8 @@
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createCuFunctionNVX( const VULKAN_HPP_NAMESPACE::CuFunctionCreateInfoNVX * pCreateInfo,
@@ -10142,8 +10142,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyCuModuleNVX( VULKAN_HPP_NAMESPACE::CuModuleNVX                 module,
@@ -10166,7 +10166,7 @@
                             static_cast<VkCuModuleNVX>( module ),
                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::CuModuleNVX                 module,
@@ -10189,7 +10189,7 @@
                             static_cast<VkCuModuleNVX>( module ),
                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyCuFunctionNVX( VULKAN_HPP_NAMESPACE::CuFunctionNVX               function,
@@ -10212,7 +10212,7 @@
                               static_cast<VkCuFunctionNVX>( function ),
                               reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::CuFunctionNVX               function,
@@ -10235,7 +10235,7 @@
                               static_cast<VkCuFunctionNVX>( function ),
                               reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::cuLaunchKernelNVX( const VULKAN_HPP_NAMESPACE::CuLaunchInfoNVX * pLaunchInfo,
@@ -10254,7 +10254,7 @@
 
     d.vkCmdCuLaunchKernelNVX( m_commandBuffer, reinterpret_cast<const VkCuLaunchInfoNVX *>( &launchInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_NVX_image_view_handle ===
 
@@ -10277,7 +10277,7 @@
 
     return result;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getImageViewAddressNVX( VULKAN_HPP_NAMESPACE::ImageView                       imageView,
@@ -10303,7 +10303,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), properties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_AMD_draw_indirect_count ===
 
@@ -10448,7 +10448,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), info );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_dynamic_rendering ===
 
@@ -10469,7 +10469,7 @@
 
     d.vkCmdBeginRenderingKHR( m_commandBuffer, reinterpret_cast<const VkRenderingInfo *>( &renderingInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::endRenderingKHR( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -10536,8 +10536,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_GGP*/
 
   //=== VK_NV_external_memory_capabilities ===
@@ -10592,7 +10592,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), externalImageFormatProperties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_NV_external_memory_win32 ===
@@ -10622,7 +10622,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), handle );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_WIN32_KHR*/
 
   //=== VK_KHR_get_physical_device_properties2 ===
@@ -10659,7 +10659,7 @@
 
     return structureChain;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void PhysicalDevice::getProperties2KHR( VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 * pProperties,
@@ -10693,7 +10693,7 @@
 
     return structureChain;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void PhysicalDevice::getFormatProperties2KHR( VULKAN_HPP_NAMESPACE::Format              format,
@@ -10732,7 +10732,7 @@
 
     return structureChain;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -10777,7 +10777,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), structureChain );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void PhysicalDevice::getQueueFamilyProperties2KHR( uint32_t *                                     pQueueFamilyPropertyCount,
@@ -10900,7 +10900,7 @@
     }
     return structureChains;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void PhysicalDevice::getMemoryProperties2KHR( VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2 * pMemoryProperties,
@@ -10935,7 +10935,7 @@
 
     return structureChain;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void PhysicalDevice::getSparseImageFormatProperties2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 * pFormatInfo,
@@ -11004,7 +11004,7 @@
     }
     return properties;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_device_group ===
 
@@ -11033,7 +11033,7 @@
 
     return peerMemoryFeatures;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setDeviceMaskKHR( uint32_t deviceMask, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -11112,8 +11112,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_VI_NN*/
 
   //=== VK_KHR_maintenance1 ===
@@ -11202,7 +11202,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), physicalDeviceGroupProperties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_external_memory_capabilities ===
 
@@ -11232,7 +11232,7 @@
 
     return externalBufferProperties;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_KHR_external_memory_win32 ===
@@ -11260,7 +11260,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), handle );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -11292,7 +11292,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), memoryWin32HandleProperties );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_WIN32_KHR*/
 
   //=== VK_KHR_external_memory_fd ===
@@ -11319,7 +11319,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), fd );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getMemoryFdPropertiesKHR( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType,
@@ -11346,7 +11346,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), memoryFdProperties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_external_semaphore_capabilities ===
 
@@ -11377,7 +11377,7 @@
 
     return externalSemaphoreProperties;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_KHR_external_semaphore_win32 ===
@@ -11405,7 +11405,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSemaphoreWin32HandleKHR(
@@ -11429,7 +11429,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), handle );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_WIN32_KHR*/
 
   //=== VK_KHR_external_semaphore_fd ===
@@ -11454,7 +11454,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSemaphoreFdKHR( const VULKAN_HPP_NAMESPACE::SemaphoreGetFdInfoKHR * pGetFdInfo,
@@ -11478,7 +11478,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), fd );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_push_descriptor ===
 
@@ -11517,7 +11517,7 @@
                                  descriptorWrites.size(),
                                  reinterpret_cast<const VkWriteDescriptorSet *>( descriptorWrites.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSetWithTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate,
@@ -11547,7 +11547,7 @@
                                              set,
                                              reinterpret_cast<const void *>( &data ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_EXT_conditional_rendering ===
 
@@ -11568,7 +11568,7 @@
 
     d.vkCmdBeginConditionalRenderingEXT( m_commandBuffer, reinterpret_cast<const VkConditionalRenderingBeginInfoEXT *>( &conditionalRenderingBegin ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::endConditionalRenderingEXT( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -11634,8 +11634,8 @@
                                   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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyDescriptorUpdateTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate    descriptorUpdateTemplate,
@@ -11660,7 +11660,7 @@
       static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::updateDescriptorSetWithTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorSet            descriptorSet,
@@ -11687,7 +11687,7 @@
                                             static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ),
                                             reinterpret_cast<const void *>( &data ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_NV_clip_space_w_scaling ===
 
@@ -11713,7 +11713,7 @@
     d.vkCmdSetViewportWScalingNV(
       m_commandBuffer, firstViewport, viewportWScalings.size(), reinterpret_cast<const VkViewportWScalingNV *>( viewportWScalings.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_EXT_direct_mode_display ===
 
@@ -11758,7 +11758,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getRandROutputDisplayEXT( Display *                          dpy,
@@ -11798,8 +11798,8 @@
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_XLIB_XRANDR_EXT*/
 
   //=== VK_EXT_display_surface_counter ===
@@ -11829,7 +11829,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), surfaceCapabilities );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_EXT_display_control ===
 
@@ -11857,7 +11857,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::registerEventEXT( const VULKAN_HPP_NAMESPACE::DeviceEventInfoEXT *  pDeviceEventInfo,
@@ -11912,8 +11912,8 @@
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::registerDisplayEventEXT( VULKAN_HPP_NAMESPACE::DisplayKHR                  display,
@@ -11974,8 +11974,8 @@
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSwapchainCounterEXT( VULKAN_HPP_NAMESPACE::SwapchainKHR              swapchain,
@@ -12002,7 +12002,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), counterValue );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_GOOGLE_display_timing ===
 
@@ -12031,7 +12031,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), displayTimingProperties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -12115,7 +12115,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), presentationTimings );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_EXT_discard_rectangles ===
 
@@ -12140,7 +12140,7 @@
     d.vkCmdSetDiscardRectangleEXT(
       m_commandBuffer, firstDiscardRectangle, discardRectangles.size(), reinterpret_cast<const VkRect2D *>( discardRectangles.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_EXT_hdr_metadata ===
 
@@ -12176,7 +12176,7 @@
                            reinterpret_cast<const VkSwapchainKHR *>( swapchains.data() ),
                            reinterpret_cast<const VkHdrMetadataEXT *>( metadata.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_create_renderpass2 ===
 
@@ -12234,8 +12234,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::beginRenderPass2KHR( const VULKAN_HPP_NAMESPACE::RenderPassBeginInfo * pRenderPassBegin,
@@ -12258,7 +12258,7 @@
     d.vkCmdBeginRenderPass2KHR(
       m_commandBuffer, reinterpret_cast<const VkRenderPassBeginInfo *>( &renderPassBegin ), reinterpret_cast<const VkSubpassBeginInfo *>( &subpassBeginInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::nextSubpass2KHR( const VULKAN_HPP_NAMESPACE::SubpassBeginInfo * pSubpassBeginInfo,
@@ -12281,7 +12281,7 @@
     d.vkCmdNextSubpass2KHR(
       m_commandBuffer, reinterpret_cast<const VkSubpassBeginInfo *>( &subpassBeginInfo ), reinterpret_cast<const VkSubpassEndInfo *>( &subpassEndInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::endRenderPass2KHR( const VULKAN_HPP_NAMESPACE::SubpassEndInfo * pSubpassEndInfo,
@@ -12300,7 +12300,7 @@
 
     d.vkCmdEndRenderPass2KHR( m_commandBuffer, reinterpret_cast<const VkSubpassEndInfo *>( &subpassEndInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_shared_presentable_image ===
 
@@ -12356,7 +12356,7 @@
 
     return externalFenceProperties;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_KHR_external_fence_win32 ===
@@ -12382,7 +12382,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getFenceWin32HandleKHR( const VULKAN_HPP_NAMESPACE::FenceGetWin32HandleInfoKHR * pGetWin32HandleInfo,
@@ -12407,7 +12407,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), handle );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_WIN32_KHR*/
 
   //=== VK_KHR_external_fence_fd ===
@@ -12432,7 +12432,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getFenceFdKHR( const VULKAN_HPP_NAMESPACE::FenceGetFdInfoKHR * pGetFdInfo,
@@ -12456,7 +12456,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), fd );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_performance_query ===
 
@@ -12570,7 +12570,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), data );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void
@@ -12596,7 +12596,7 @@
 
     return numPasses;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::acquireProfilingLockKHR( const VULKAN_HPP_NAMESPACE::AcquireProfilingLockInfoKHR * pInfo,
@@ -12618,7 +12618,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::releaseProfilingLockKHR( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -12672,7 +12672,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), structureChain );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getSurfaceFormats2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
@@ -12842,7 +12842,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), structureChains );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_get_display_properties2 ===
 
@@ -12917,7 +12917,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), properties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getDisplayPlaneProperties2KHR( uint32_t * pPropertyCount,
@@ -12990,7 +12990,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), properties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getDisplayModeProperties2KHR( VULKAN_HPP_NAMESPACE::DisplayKHR                  display,
@@ -13066,7 +13066,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), properties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -13095,7 +13095,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), capabilities );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_IOS_MVK )
   //=== VK_MVK_ios_surface ===
@@ -13154,8 +13154,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_IOS_MVK*/
 
 #if defined( VK_USE_PLATFORM_MACOS_MVK )
@@ -13215,8 +13215,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_MACOS_MVK*/
 
   //=== VK_EXT_debug_utils ===
@@ -13241,7 +13241,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::setDebugUtilsObjectTagEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsObjectTagInfoEXT * pTagInfo,
@@ -13263,7 +13263,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Queue::beginDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT * pLabelInfo,
@@ -13282,7 +13282,7 @@
 
     d.vkQueueBeginDebugUtilsLabelEXT( m_queue, reinterpret_cast<const VkDebugUtilsLabelEXT *>( &labelInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Queue::endDebugUtilsLabelEXT( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -13308,7 +13308,7 @@
 
     d.vkQueueInsertDebugUtilsLabelEXT( m_queue, reinterpret_cast<const VkDebugUtilsLabelEXT *>( &labelInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::beginDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT * pLabelInfo,
@@ -13327,7 +13327,7 @@
 
     d.vkCmdBeginDebugUtilsLabelEXT( m_commandBuffer, reinterpret_cast<const VkDebugUtilsLabelEXT *>( &labelInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::endDebugUtilsLabelEXT( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -13353,7 +13353,7 @@
 
     d.vkCmdInsertDebugUtilsLabelEXT( m_commandBuffer, reinterpret_cast<const VkDebugUtilsLabelEXT *>( &labelInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -13410,8 +13410,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Instance::destroyDebugUtilsMessengerEXT( VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT      messenger,
@@ -13436,7 +13436,7 @@
       static_cast<VkDebugUtilsMessengerEXT>( messenger ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Instance::destroy( VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT      messenger,
@@ -13461,7 +13461,7 @@
       static_cast<VkDebugUtilsMessengerEXT>( messenger ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Instance::submitDebugUtilsMessageEXT( VULKAN_HPP_NAMESPACE::DebugUtilsMessageSeverityFlagBitsEXT       messageSeverity,
@@ -13490,7 +13490,7 @@
                                     static_cast<VkDebugUtilsMessageTypeFlagsEXT>( messageTypes ),
                                     reinterpret_cast<const VkDebugUtilsMessengerCallbackDataEXT *>( &callbackData ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
   //=== VK_ANDROID_external_memory_android_hardware_buffer ===
@@ -13536,7 +13536,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), structureChain );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -13563,7 +13563,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), buffer );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_ANDROID_KHR*/
 
   //=== VK_EXT_sample_locations ===
@@ -13585,7 +13585,7 @@
 
     d.vkCmdSetSampleLocationsEXT( m_commandBuffer, reinterpret_cast<const VkSampleLocationsInfoEXT *>( &sampleLocationsInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void PhysicalDevice::getMultisamplePropertiesEXT( VULKAN_HPP_NAMESPACE::SampleCountFlagBits        samples,
@@ -13610,7 +13610,7 @@
 
     return multisampleProperties;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_get_memory_requirements2 ===
 
@@ -13651,7 +13651,7 @@
 
     return structureChain;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getBufferMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 * pInfo,
@@ -13690,7 +13690,7 @@
 
     return structureChain;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getImageSparseMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 * pInfo,
@@ -13759,7 +13759,7 @@
     }
     return sparseMemoryRequirements;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_acceleration_structure ===
 
@@ -13818,8 +13818,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR    accelerationStructure,
@@ -13844,7 +13844,7 @@
       static_cast<VkAccelerationStructureKHR>( accelerationStructure ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR    accelerationStructure,
@@ -13869,7 +13869,7 @@
       static_cast<VkAccelerationStructureKHR>( accelerationStructure ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void
@@ -13907,7 +13907,7 @@
                                            reinterpret_cast<const VkAccelerationStructureBuildGeometryInfoKHR *>( infos.data() ),
                                            reinterpret_cast<const VkAccelerationStructureBuildRangeInfoKHR * const *>( pBuildRangeInfos.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::buildAccelerationStructuresIndirectKHR( uint32_t infoCount,
@@ -13962,7 +13962,7 @@
                                                    indirectStrides.data(),
                                                    pMaxPrimitiveCounts.data() );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -14012,7 +14012,7 @@
 
     return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation,
@@ -14042,7 +14042,7 @@
 
     return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -14073,7 +14073,7 @@
 
     return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -14104,7 +14104,7 @@
 
     return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -14173,7 +14173,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), data );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::copyAccelerationStructureKHR( const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureInfoKHR * pInfo,
@@ -14192,7 +14192,7 @@
 
     d.vkCmdCopyAccelerationStructureKHR( m_commandBuffer, reinterpret_cast<const VkCopyAccelerationStructureInfoKHR *>( &info ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::copyAccelerationStructureToMemoryKHR( const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureToMemoryInfoKHR * pInfo,
@@ -14211,7 +14211,7 @@
 
     d.vkCmdCopyAccelerationStructureToMemoryKHR( m_commandBuffer, reinterpret_cast<const VkCopyAccelerationStructureToMemoryInfoKHR *>( &info ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::copyMemoryToAccelerationStructureKHR( const VULKAN_HPP_NAMESPACE::CopyMemoryToAccelerationStructureInfoKHR * pInfo,
@@ -14230,7 +14230,7 @@
 
     d.vkCmdCopyMemoryToAccelerationStructureKHR( m_commandBuffer, reinterpret_cast<const VkCopyMemoryToAccelerationStructureInfoKHR *>( &info ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE DeviceAddress Device::getAccelerationStructureAddressKHR( const VULKAN_HPP_NAMESPACE::AccelerationStructureDeviceAddressInfoKHR * pInfo,
@@ -14254,7 +14254,7 @@
 
     return static_cast<VULKAN_HPP_NAMESPACE::DeviceAddress>( result );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void
@@ -14292,7 +14292,7 @@
                                                      static_cast<VkQueryPool>( queryPool ),
                                                      firstQuery );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getAccelerationStructureCompatibilityKHR( const VULKAN_HPP_NAMESPACE::AccelerationStructureVersionInfoKHR * pVersionInfo,
@@ -14320,7 +14320,7 @@
 
     return compatibility;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getAccelerationStructureBuildSizesKHR( VULKAN_HPP_NAMESPACE::AccelerationStructureBuildTypeKHR                 buildType,
@@ -14364,7 +14364,7 @@
 
     return sizeInfo;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_sampler_ycbcr_conversion ===
 
@@ -14423,8 +14423,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroySamplerYcbcrConversionKHR( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion      ycbcrConversion,
@@ -14449,7 +14449,7 @@
       static_cast<VkSamplerYcbcrConversion>( ycbcrConversion ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_bind_memory2 ===
 
@@ -14475,7 +14475,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::bindImageMemory2KHR( uint32_t                                          bindInfoCount,
@@ -14498,7 +14498,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_EXT_image_drm_format_modifier ===
 
@@ -14525,7 +14525,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), properties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_EXT_validation_cache ===
 
@@ -14583,8 +14583,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyValidationCacheEXT( VULKAN_HPP_NAMESPACE::ValidationCacheEXT          validationCache,
@@ -14609,7 +14609,7 @@
       static_cast<VkValidationCacheEXT>( validationCache ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::ValidationCacheEXT          validationCache,
@@ -14634,7 +14634,7 @@
       static_cast<VkValidationCacheEXT>( validationCache ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::mergeValidationCachesEXT( VULKAN_HPP_NAMESPACE::ValidationCacheEXT         dstCache,
@@ -14662,7 +14662,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getValidationCacheDataEXT( VULKAN_HPP_NAMESPACE::ValidationCacheEXT validationCache,
@@ -14733,7 +14733,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), data );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_NV_shading_rate_image ===
 
@@ -14769,7 +14769,7 @@
     d.vkCmdSetViewportShadingRatePaletteNV(
       m_commandBuffer, firstViewport, shadingRatePalettes.size(), reinterpret_cast<const VkShadingRatePaletteNV *>( shadingRatePalettes.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setCoarseSampleOrderNV( VULKAN_HPP_NAMESPACE::CoarseSampleOrderTypeNV           sampleOrderType,
@@ -14798,7 +14798,7 @@
                                    customSampleOrders.size(),
                                    reinterpret_cast<const VkCoarseSampleOrderCustomNV *>( customSampleOrders.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_NV_ray_tracing ===
 
@@ -14857,8 +14857,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyAccelerationStructureNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV     accelerationStructure,
@@ -14883,7 +14883,7 @@
       static_cast<VkAccelerationStructureNV>( accelerationStructure ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::AccelerationStructureNV     accelerationStructure,
@@ -14908,7 +14908,7 @@
       static_cast<VkAccelerationStructureNV>( accelerationStructure ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void
@@ -14953,7 +14953,7 @@
 
     return structureChain;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::bindAccelerationStructureMemoryNV(
@@ -14977,7 +14977,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::buildAccelerationStructureNV( const VULKAN_HPP_NAMESPACE::AccelerationStructureInfoNV * pInfo,
@@ -15026,7 +15026,7 @@
                                          static_cast<VkBuffer>( scratch ),
                                          static_cast<VkDeviceSize>( scratchOffset ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::copyAccelerationStructureNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV          dst,
@@ -15262,8 +15262,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getRayTracingShaderGroupHandlesNV( VULKAN_HPP_NAMESPACE::Pipeline pipeline,
@@ -15307,7 +15307,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), data );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getAccelerationStructureHandleNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV accelerationStructure,
@@ -15349,7 +15349,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), data );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::writeAccelerationStructuresPropertiesNV( uint32_t accelerationStructureCount,
@@ -15386,7 +15386,7 @@
                                                     static_cast<VkQueryPool>( queryPool ),
                                                     firstQuery );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
   template <typename Dispatch>
@@ -15452,7 +15452,7 @@
 
     return structureChain;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_draw_indirect_count ===
 
@@ -15528,7 +15528,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), memoryHostPointerProperties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_AMD_buffer_marker ===
 
@@ -15618,7 +15618,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), timeDomains );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getCalibratedTimestampsEXT( uint32_t                                                 timestampCount,
@@ -15688,7 +15688,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), data );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_NV_mesh_shader ===
 
@@ -15752,7 +15752,7 @@
     d.vkCmdSetExclusiveScissorNV(
       m_commandBuffer, firstExclusiveScissor, exclusiveScissors.size(), reinterpret_cast<const VkRect2D *>( exclusiveScissors.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_NV_device_diagnostic_checkpoints ===
 
@@ -15771,7 +15771,7 @@
 
     d.vkCmdSetCheckpointNV( m_commandBuffer, reinterpret_cast<const void *>( &checkpointMarker ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Queue::getCheckpointDataNV( uint32_t *                               pCheckpointDataCount,
@@ -15825,7 +15825,7 @@
     }
     return checkpointData;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_timeline_semaphore ===
 
@@ -15851,7 +15851,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), value );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::waitSemaphoresKHR( const VULKAN_HPP_NAMESPACE::SemaphoreWaitInfo * pWaitInfo,
@@ -15876,7 +15876,7 @@
 
     return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::signalSemaphoreKHR( const VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo * pSignalInfo,
@@ -15898,7 +15898,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_INTEL_performance_query ===
 
@@ -15923,7 +15923,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::uninitializePerformanceApiINTEL( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -15952,7 +15952,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result CommandBuffer::setPerformanceStreamMarkerINTEL(
@@ -15975,7 +15975,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result CommandBuffer::setPerformanceOverrideINTEL(
@@ -15998,7 +15998,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -16046,8 +16046,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
   template <typename Dispatch>
@@ -16139,7 +16139,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), value );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_AMD_display_native_hdr ===
 
@@ -16210,8 +16210,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_FUCHSIA*/
 
 #if defined( VK_USE_PLATFORM_METAL_EXT )
@@ -16271,8 +16271,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_METAL_EXT*/
 
   //=== VK_KHR_fragment_shading_rate ===
@@ -16351,7 +16351,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), fragmentShadingRates );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setFragmentShadingRateKHR( const VULKAN_HPP_NAMESPACE::Extent2D *                       pFragmentSize,
@@ -16374,7 +16374,7 @@
     d.vkCmdSetFragmentShadingRateKHR(
       m_commandBuffer, reinterpret_cast<const VkExtent2D *>( &fragmentSize ), reinterpret_cast<const VkFragmentShadingRateCombinerOpKHR *>( combinerOps ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_EXT_buffer_device_address ===
 
@@ -16397,7 +16397,7 @@
 
     return static_cast<VULKAN_HPP_NAMESPACE::DeviceAddress>( result );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_EXT_tooling_info ===
 
@@ -16473,7 +16473,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), toolProperties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_present_wait ===
 
@@ -16577,7 +16577,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), properties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_NV_coverage_reduction_mode ===
 
@@ -16655,7 +16655,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), combinations );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_EXT_full_screen_exclusive ===
@@ -16741,7 +16741,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), presentModes );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #  ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
   template <typename Dispatch>
@@ -16812,7 +16812,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), modes );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_WIN32_KHR*/
 
   //=== VK_EXT_headless_surface ===
@@ -16871,8 +16871,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_buffer_device_address ===
 
@@ -16895,7 +16895,7 @@
 
     return static_cast<VULKAN_HPP_NAMESPACE::DeviceAddress>( result );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE uint64_t Device::getBufferOpaqueCaptureAddressKHR( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo * pInfo,
@@ -16916,7 +16916,7 @@
 
     return result;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE uint64_t Device::getMemoryOpaqueCaptureAddressKHR( const VULKAN_HPP_NAMESPACE::DeviceMemoryOpaqueCaptureAddressInfo * pInfo,
@@ -16937,7 +16937,7 @@
 
     return result;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_EXT_line_rasterization ===
 
@@ -17003,7 +17003,7 @@
 
     d.vkCmdSetViewportWithCountEXT( m_commandBuffer, viewports.size(), reinterpret_cast<const VkViewport *>( viewports.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void
@@ -17022,7 +17022,7 @@
 
     d.vkCmdSetScissorWithCountEXT( m_commandBuffer, scissors.size(), reinterpret_cast<const VkRect2D *>( scissors.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::bindVertexBuffers2EXT( uint32_t                                 firstBinding,
@@ -17080,7 +17080,7 @@
                                   reinterpret_cast<const VkDeviceSize *>( sizes.data() ),
                                   reinterpret_cast<const VkDeviceSize *>( strides.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setDepthTestEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthTestEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -17182,8 +17182,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyDeferredOperationKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR        operation,
@@ -17208,7 +17208,7 @@
       static_cast<VkDeferredOperationKHR>( operation ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::DeferredOperationKHR        operation,
@@ -17233,7 +17233,7 @@
       static_cast<VkDeferredOperationKHR>( operation ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE uint32_t Device::getDeferredOperationMaxConcurrencyKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR operation,
@@ -17371,7 +17371,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), properties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -17457,7 +17457,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), statistics );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -17548,7 +17548,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), internalRepresentations );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_NV_device_generated_commands ===
 
@@ -17594,7 +17594,7 @@
 
     return structureChain;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::preprocessGeneratedCommandsNV( const VULKAN_HPP_NAMESPACE::GeneratedCommandsInfoNV * pGeneratedCommandsInfo,
@@ -17613,7 +17613,7 @@
 
     d.vkCmdPreprocessGeneratedCommandsNV( m_commandBuffer, reinterpret_cast<const VkGeneratedCommandsInfoNV *>( &generatedCommandsInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::executeGeneratedCommandsNV( VULKAN_HPP_NAMESPACE::Bool32                          isPreprocessed,
@@ -17636,7 +17636,7 @@
     d.vkCmdExecuteGeneratedCommandsNV(
       m_commandBuffer, static_cast<VkBool32>( isPreprocessed ), reinterpret_cast<const VkGeneratedCommandsInfoNV *>( &generatedCommandsInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::bindPipelineShaderGroupNV( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint,
@@ -17703,8 +17703,8 @@
                                   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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyIndirectCommandsLayoutNV( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV    indirectCommandsLayout,
@@ -17729,7 +17729,7 @@
       static_cast<VkIndirectCommandsLayoutNV>( indirectCommandsLayout ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV    indirectCommandsLayout,
@@ -17754,7 +17754,7 @@
       static_cast<VkIndirectCommandsLayoutNV>( indirectCommandsLayout ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_EXT_acquire_drm_display ===
 
@@ -17819,8 +17819,8 @@
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_EXT_private_data ===
 
@@ -17878,8 +17878,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyPrivateDataSlotEXT( VULKAN_HPP_NAMESPACE::PrivateDataSlot             privateDataSlot,
@@ -17903,7 +17903,7 @@
       static_cast<VkPrivateDataSlot>( privateDataSlot ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
   template <typename Dispatch>
@@ -17960,7 +17960,7 @@
 
     return data;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
   //=== VK_KHR_video_encode_queue ===
@@ -17982,7 +17982,7 @@
 
     d.vkCmdEncodeVideoKHR( m_commandBuffer, reinterpret_cast<const VkVideoEncodeInfoKHR *>( &encodeInfo ) );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_ENABLE_BETA_EXTENSIONS*/
 
 #if defined( VK_USE_PLATFORM_METAL_EXT )
@@ -18020,7 +18020,7 @@
 
     return structureChain;
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_METAL_EXT*/
 
   //=== VK_KHR_synchronization2 ===
@@ -18044,7 +18044,7 @@
 
     d.vkCmdSetEvent2KHR( m_commandBuffer, static_cast<VkEvent>( event ), reinterpret_cast<const VkDependencyInfo *>( &dependencyInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::resetEvent2KHR( VULKAN_HPP_NAMESPACE::Event               event,
@@ -18087,7 +18087,7 @@
                            reinterpret_cast<const VkEvent *>( events.data() ),
                            reinterpret_cast<const VkDependencyInfo *>( dependencyInfos.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::pipelineBarrier2KHR( const VULKAN_HPP_NAMESPACE::DependencyInfo * pDependencyInfo,
@@ -18106,7 +18106,7 @@
 
     d.vkCmdPipelineBarrier2KHR( m_commandBuffer, reinterpret_cast<const VkDependencyInfo *>( &dependencyInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::writeTimestamp2KHR( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stage,
@@ -18141,7 +18141,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::writeBufferMarker2AMD( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stage,
@@ -18207,7 +18207,7 @@
     }
     return checkpointData;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_EXT_descriptor_buffer ===
 
@@ -18232,7 +18232,7 @@
 
     return layoutSizeInBytes;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getDescriptorSetLayoutBindingOffsetEXT( VULKAN_HPP_NAMESPACE::DescriptorSetLayout layout,
@@ -18256,7 +18256,7 @@
 
     return offset;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getDescriptorEXT( const VULKAN_HPP_NAMESPACE::DescriptorGetInfoEXT * pDescriptorInfo,
@@ -18281,7 +18281,7 @@
 
     return descriptor;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorBuffersEXT( uint32_t                                                     bufferCount,
@@ -18302,7 +18302,7 @@
 
     d.vkCmdBindDescriptorBuffersEXT( m_commandBuffer, bindingInfos.size(), reinterpret_cast<const VkDescriptorBufferBindingInfoEXT *>( bindingInfos.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setDescriptorBufferOffsetsEXT( VULKAN_HPP_NAMESPACE::PipelineBindPoint  pipelineBindPoint,
@@ -18350,7 +18350,7 @@
                                           bufferIndices.data(),
                                           reinterpret_cast<const VkDeviceSize *>( offsets.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorBufferEmbeddedSamplersEXT( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint,
@@ -18385,7 +18385,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), data );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getImageOpaqueCaptureDescriptorDataEXT(
@@ -18409,7 +18409,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), data );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getImageViewOpaqueCaptureDescriptorDataEXT(
@@ -18434,7 +18434,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), data );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSamplerOpaqueCaptureDescriptorDataEXT(
@@ -18458,7 +18458,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), data );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getAccelerationStructureOpaqueCaptureDescriptorDataEXT(
@@ -18485,7 +18485,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), data );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_NV_fragment_shading_rate_enums ===
 
@@ -18558,7 +18558,7 @@
 
     d.vkCmdCopyBuffer2KHR( m_commandBuffer, reinterpret_cast<const VkCopyBufferInfo2 *>( &copyBufferInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::copyImage2KHR( const VULKAN_HPP_NAMESPACE::CopyImageInfo2 * pCopyImageInfo,
@@ -18577,7 +18577,7 @@
 
     d.vkCmdCopyImage2KHR( m_commandBuffer, reinterpret_cast<const VkCopyImageInfo2 *>( &copyImageInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::copyBufferToImage2KHR( const VULKAN_HPP_NAMESPACE::CopyBufferToImageInfo2 * pCopyBufferToImageInfo,
@@ -18596,7 +18596,7 @@
 
     d.vkCmdCopyBufferToImage2KHR( m_commandBuffer, reinterpret_cast<const VkCopyBufferToImageInfo2 *>( &copyBufferToImageInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::copyImageToBuffer2KHR( const VULKAN_HPP_NAMESPACE::CopyImageToBufferInfo2 * pCopyImageToBufferInfo,
@@ -18615,7 +18615,7 @@
 
     d.vkCmdCopyImageToBuffer2KHR( m_commandBuffer, reinterpret_cast<const VkCopyImageToBufferInfo2 *>( &copyImageToBufferInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::blitImage2KHR( const VULKAN_HPP_NAMESPACE::BlitImageInfo2 * pBlitImageInfo,
@@ -18634,7 +18634,7 @@
 
     d.vkCmdBlitImage2KHR( m_commandBuffer, reinterpret_cast<const VkBlitImageInfo2 *>( &blitImageInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::resolveImage2KHR( const VULKAN_HPP_NAMESPACE::ResolveImageInfo2 * pResolveImageInfo,
@@ -18653,7 +18653,7 @@
 
     d.vkCmdResolveImage2KHR( m_commandBuffer, reinterpret_cast<const VkResolveImageInfo2 *>( &resolveImageInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_EXT_image_compression_control ===
 
@@ -18701,7 +18701,7 @@
 
     return structureChain;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_EXT_device_fault ===
 
@@ -18734,7 +18734,7 @@
     return ResultValue<std::pair<VULKAN_HPP_NAMESPACE::DeviceFaultCountsEXT, VULKAN_HPP_NAMESPACE::DeviceFaultInfoEXT>>(
       static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), data );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_NV_acquire_winrt_display ===
@@ -18798,8 +18798,8 @@
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_WIN32_KHR*/
 
 #if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
@@ -18859,8 +18859,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE Bool32 PhysicalDevice::getDirectFBPresentationSupportEXT( uint32_t         queueFamilyIndex,
@@ -18882,7 +18882,7 @@
 
     return static_cast<VULKAN_HPP_NAMESPACE::Bool32>( result );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_DIRECTFB_EXT*/
 
   //=== VK_KHR_ray_tracing_pipeline ===
@@ -18930,7 +18930,7 @@
                          height,
                          depth );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -19153,8 +19153,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getRayTracingShaderGroupHandlesKHR( VULKAN_HPP_NAMESPACE::Pipeline pipeline,
@@ -19198,7 +19198,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), data );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getRayTracingCaptureReplayShaderGroupHandlesKHR( VULKAN_HPP_NAMESPACE::Pipeline pipeline,
@@ -19243,7 +19243,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), data );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::traceRaysIndirectKHR( const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR * pRaygenShaderBindingTable,
@@ -19280,7 +19280,7 @@
                                  reinterpret_cast<const VkStridedDeviceAddressRegionKHR *>( &callableShaderBindingTable ),
                                  static_cast<VkDeviceAddress>( indirectDeviceAddress ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE DeviceSize Device::getRayTracingShaderGroupStackSizeKHR( VULKAN_HPP_NAMESPACE::Pipeline             pipeline,
@@ -19332,7 +19332,7 @@
                               vertexAttributeDescriptions.size(),
                               reinterpret_cast<const VkVertexInputAttributeDescription2EXT *>( vertexAttributeDescriptions.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
   //=== VK_FUCHSIA_external_memory ===
@@ -19362,7 +19362,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), zirconHandle );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -19397,7 +19397,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), memoryZirconHandleProperties );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_FUCHSIA*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
@@ -19426,7 +19426,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -19453,7 +19453,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), zirconHandle );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_FUCHSIA*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
@@ -19514,8 +19514,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -19543,7 +19543,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -19571,7 +19571,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ) );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyBufferCollectionFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA     collection,
@@ -19596,7 +19596,7 @@
       static_cast<VkBufferCollectionFUCHSIA>( collection ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA     collection,
@@ -19621,7 +19621,7 @@
       static_cast<VkBufferCollectionFUCHSIA>( collection ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
@@ -19648,7 +19648,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), properties );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_FUCHSIA*/
 
   //=== VK_HUAWEI_subpass_shading ===
@@ -19679,7 +19679,7 @@
 
     return ResultValue<VULKAN_HPP_NAMESPACE::Extent2D>( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), maxWorkgroupSize );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::subpassShadingHUAWEI( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -19726,7 +19726,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), address );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_EXT_pipeline_properties ===
 
@@ -19754,7 +19754,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), pipelineProperties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_EXT_extended_dynamic_state2 ===
 
@@ -19852,8 +19852,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE Bool32 PhysicalDevice::getScreenPresentationSupportQNX( uint32_t                queueFamilyIndex,
@@ -19875,7 +19875,7 @@
 
     return static_cast<VULKAN_HPP_NAMESPACE::Bool32>( result );
   }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_SCREEN_QNX*/
 
   //=== VK_EXT_color_write_enable ===
@@ -19898,7 +19898,7 @@
 
     d.vkCmdSetColorWriteEnableEXT( m_commandBuffer, colorWriteEnables.size(), reinterpret_cast<const VkBool32 *>( colorWriteEnables.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_ray_tracing_maintenance1 ===
 
@@ -19940,7 +19940,7 @@
                          firstInstance,
                          vertexInfo.stride() );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::drawMultiIndexedEXT( uint32_t                                              drawCount,
@@ -19975,7 +19975,7 @@
                                 indexInfo.stride(),
                                 static_cast<const int32_t *>( vertexOffset ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_EXT_opacity_micromap ===
 
@@ -20033,8 +20033,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyMicromapEXT( VULKAN_HPP_NAMESPACE::MicromapEXT                 micromap,
@@ -20057,7 +20057,7 @@
                             static_cast<VkMicromapEXT>( micromap ),
                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::MicromapEXT                 micromap,
@@ -20080,7 +20080,7 @@
                             static_cast<VkMicromapEXT>( micromap ),
                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::buildMicromapsEXT( uint32_t                                           infoCount,
@@ -20100,7 +20100,7 @@
 
     d.vkCmdBuildMicromapsEXT( m_commandBuffer, infos.size(), reinterpret_cast<const VkMicromapBuildInfoEXT *>( infos.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::buildMicromapsEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR         deferredOperation,
@@ -20131,7 +20131,7 @@
 
     return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyMicromapEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR        deferredOperation,
@@ -20160,7 +20160,7 @@
 
     return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyMicromapToMemoryEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                deferredOperation,
@@ -20188,7 +20188,7 @@
 
     return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyMemoryToMicromapEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                deferredOperation,
@@ -20216,7 +20216,7 @@
 
     return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::writeMicromapsPropertiesEXT( uint32_t                                  micromapCount,
@@ -20278,7 +20278,7 @@
 
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), data );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::copyMicromapEXT( const VULKAN_HPP_NAMESPACE::CopyMicromapInfoEXT * pInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -20295,7 +20295,7 @@
 
     d.vkCmdCopyMicromapEXT( m_commandBuffer, reinterpret_cast<const VkCopyMicromapInfoEXT *>( &info ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::copyMicromapToMemoryEXT( const VULKAN_HPP_NAMESPACE::CopyMicromapToMemoryInfoEXT * pInfo,
@@ -20314,7 +20314,7 @@
 
     d.vkCmdCopyMicromapToMemoryEXT( m_commandBuffer, reinterpret_cast<const VkCopyMicromapToMemoryInfoEXT *>( &info ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::copyMemoryToMicromapEXT( const VULKAN_HPP_NAMESPACE::CopyMemoryToMicromapInfoEXT * pInfo,
@@ -20333,7 +20333,7 @@
 
     d.vkCmdCopyMemoryToMicromapEXT( m_commandBuffer, reinterpret_cast<const VkCopyMemoryToMicromapInfoEXT *>( &info ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::writeMicromapsPropertiesEXT( uint32_t                                  micromapCount,
@@ -20370,7 +20370,7 @@
                                         static_cast<VkQueryPool>( queryPool ),
                                         firstQuery );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getMicromapCompatibilityEXT( const VULKAN_HPP_NAMESPACE::MicromapVersionInfoEXT *          pVersionInfo,
@@ -20397,7 +20397,7 @@
 
     return compatibility;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getMicromapBuildSizesEXT( VULKAN_HPP_NAMESPACE::AccelerationStructureBuildTypeKHR buildType,
@@ -20429,7 +20429,7 @@
 
     return sizeInfo;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_EXT_pageable_device_local_memory ===
 
@@ -20479,7 +20479,7 @@
 
     return structureChain;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getImageMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements * pInfo,
@@ -20518,7 +20518,7 @@
 
     return structureChain;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getImageSparseMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements * pInfo,
@@ -20587,7 +20587,7 @@
     }
     return sparseMemoryRequirements;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_VALVE_descriptor_set_host_mapping ===
 
@@ -20617,7 +20617,7 @@
 
     return hostMapping;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void
@@ -20639,7 +20639,7 @@
 
     return pData;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_NV_copy_memory_indirect ===
 
@@ -20692,7 +20692,7 @@
                                         static_cast<VkImageLayout>( dstImageLayout ),
                                         reinterpret_cast<const VkImageSubresourceLayers *>( imageSubresources.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_NV_memory_decompression ===
 
@@ -20716,7 +20716,7 @@
     d.vkCmdDecompressMemoryNV(
       m_commandBuffer, decompressMemoryRegions.size(), reinterpret_cast<const VkDecompressMemoryRegionNV *>( decompressMemoryRegions.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::decompressMemoryIndirectCountNV( VULKAN_HPP_NAMESPACE::DeviceAddress indirectCommandsAddress,
@@ -20780,7 +20780,7 @@
 
     d.vkCmdSetSampleMaskEXT( m_commandBuffer, static_cast<VkSampleCountFlagBits>( samples ), reinterpret_cast<const VkSampleMask *>( sampleMask.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setAlphaToCoverageEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 alphaToCoverageEnable,
@@ -20824,7 +20824,7 @@
 
     d.vkCmdSetColorBlendEnableEXT( m_commandBuffer, firstAttachment, colorBlendEnables.size(), reinterpret_cast<const VkBool32 *>( colorBlendEnables.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setColorBlendEquationEXT( uint32_t                                            firstAttachment,
@@ -20849,7 +20849,7 @@
     d.vkCmdSetColorBlendEquationEXT(
       m_commandBuffer, firstAttachment, colorBlendEquations.size(), reinterpret_cast<const VkColorBlendEquationEXT *>( colorBlendEquations.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setColorWriteMaskEXT( uint32_t                                          firstAttachment,
@@ -20873,7 +20873,7 @@
     d.vkCmdSetColorWriteMaskEXT(
       m_commandBuffer, firstAttachment, colorWriteMasks.size(), reinterpret_cast<const VkColorComponentFlags *>( colorWriteMasks.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setRasterizationStreamEXT( uint32_t rasterizationStream, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
@@ -20937,7 +20937,7 @@
     d.vkCmdSetColorBlendAdvancedEXT(
       m_commandBuffer, firstAttachment, colorBlendAdvanced.size(), reinterpret_cast<const VkColorBlendAdvancedEXT *>( colorBlendAdvanced.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setProvokingVertexModeEXT( VULKAN_HPP_NAMESPACE::ProvokingVertexModeEXT provokingVertexMode,
@@ -21000,7 +21000,7 @@
     d.vkCmdSetViewportSwizzleNV(
       m_commandBuffer, firstViewport, viewportSwizzles.size(), reinterpret_cast<const VkViewportSwizzleNV *>( viewportSwizzles.data() ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setCoverageToColorEnableNV( VULKAN_HPP_NAMESPACE::Bool32 coverageToColorEnable,
@@ -21051,7 +21051,7 @@
 
     d.vkCmdSetCoverageModulationTableNV( m_commandBuffer, coverageModulationTable.size(), coverageModulationTable.data() );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setShadingRateImageEnableNV( VULKAN_HPP_NAMESPACE::Bool32 shadingRateImageEnable,
@@ -21100,7 +21100,7 @@
 
     return identifier;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::getShaderModuleCreateInfoIdentifierEXT( const VULKAN_HPP_NAMESPACE::ShaderModuleCreateInfo * pCreateInfo,
@@ -21126,7 +21126,7 @@
 
     return identifier;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_NV_optical_flow ===
 
@@ -21216,7 +21216,7 @@
     }
     return createResultValueType( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ), imageFormatProperties );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createOpticalFlowSessionNV( const VULKAN_HPP_NAMESPACE::OpticalFlowSessionCreateInfoNV * pCreateInfo,
@@ -21272,8 +21272,8 @@
       static_cast<VULKAN_HPP_NAMESPACE::Result>( 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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroyOpticalFlowSessionNV( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV        session,
@@ -21297,7 +21297,7 @@
       static_cast<VkOpticalFlowSessionNV>( session ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV        session,
@@ -21321,7 +21321,7 @@
       static_cast<VkOpticalFlowSessionNV>( session ),
       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
   template <typename Dispatch>
@@ -21381,7 +21381,7 @@
     d.vkCmdOpticalFlowExecuteNV(
       m_commandBuffer, static_cast<VkOpticalFlowSessionNV>( session ), reinterpret_cast<const VkOpticalFlowExecuteInfoNV *>( &executeInfo ) );
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_QCOM_tile_properties ===
 
@@ -21457,7 +21457,7 @@
     }
     return properties;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch>
   VULKAN_HPP_INLINE Result Device::getDynamicRenderingTilePropertiesQCOM( const VULKAN_HPP_NAMESPACE::RenderingInfo * pRenderingInfo,
@@ -21482,7 +21482,7 @@
 
     return properties;
   }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 }  // namespace VULKAN_HPP_NAMESPACE
 #endif
diff --git a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_handles.hpp b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_handles.hpp
index 4d551c1..4161849 100644
--- a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_handles.hpp
+++ b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_handles.hpp
@@ -1496,10 +1496,6 @@
   struct RenderPassSubpassFeedbackInfoEXT;
   struct RenderPassSubpassFeedbackCreateInfoEXT;
 
-  //=== VK_LUNARG_direct_driver_loading ===
-  struct DirectDriverLoadingInfoLUNARG;
-  struct DirectDriverLoadingListLUNARG;
-
   //=== VK_EXT_shader_module_identifier ===
   struct PhysicalDeviceShaderModuleIdentifierFeaturesEXT;
   struct PhysicalDeviceShaderModuleIdentifierPropertiesEXT;
@@ -1533,9 +1529,6 @@
   struct PhysicalDeviceAmigoProfilingFeaturesSEC;
   struct AmigoProfilingSubmitInfoSEC;
 
-  //=== VK_QCOM_multiview_per_view_viewports ===
-  struct PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM;
-
   //=== VK_NV_ray_tracing_invocation_reorder ===
   struct PhysicalDeviceRayTracingInvocationReorderPropertiesNV;
   struct PhysicalDeviceRayTracingInvocationReorderFeaturesNV;
@@ -3400,7 +3393,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
@@ -3435,7 +3428,7 @@
     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;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setScissor( uint32_t                             firstScissor,
@@ -3447,7 +3440,7 @@
     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;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setLineWidth( float lineWidth, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
@@ -3496,7 +3489,7 @@
                              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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void bindIndexBuffer( VULKAN_HPP_NAMESPACE::Buffer     buffer,
@@ -3516,7 +3509,7 @@
                             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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void draw( uint32_t           vertexCount,
@@ -3570,7 +3563,7 @@
                      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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void copyImage( VULKAN_HPP_NAMESPACE::Image             srcImage,
@@ -3588,7 +3581,7 @@
                     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;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void blitImage( VULKAN_HPP_NAMESPACE::Image             srcImage,
@@ -3608,7 +3601,7 @@
                     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void copyBufferToImage( VULKAN_HPP_NAMESPACE::Buffer                  srcBuffer,
@@ -3624,7 +3617,7 @@
                             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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void copyImageToBuffer( VULKAN_HPP_NAMESPACE::Image                   srcImage,
@@ -3640,7 +3633,7 @@
                             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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void updateBuffer( VULKAN_HPP_NAMESPACE::Buffer     dstBuffer,
@@ -3654,7 +3647,7 @@
                        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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void fillBuffer( VULKAN_HPP_NAMESPACE::Buffer     dstBuffer,
@@ -3677,7 +3670,7 @@
                           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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void clearDepthStencilImage( VULKAN_HPP_NAMESPACE::Image                          image,
@@ -3693,7 +3686,7 @@
                                  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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void clearAttachments( uint32_t                                      attachmentCount,
@@ -3706,7 +3699,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void resolveImage( VULKAN_HPP_NAMESPACE::Image                srcImage,
@@ -3724,7 +3717,7 @@
                        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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setEvent( VULKAN_HPP_NAMESPACE::Event              event,
@@ -3757,7 +3750,7 @@
                      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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void pipelineBarrier( VULKAN_HPP_NAMESPACE::PipelineStageFlags          srcStageMask,
@@ -3779,7 +3772,7 @@
                           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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void beginQuery( VULKAN_HPP_NAMESPACE::QueryPool         queryPool,
@@ -3828,7 +3821,7 @@
                         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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void beginRenderPass( const VULKAN_HPP_NAMESPACE::RenderPassBeginInfo * pRenderPassBegin,
@@ -3839,7 +3832,7 @@
     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 */
+#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;
@@ -3855,7 +3848,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_VERSION_1_1 ===
 
@@ -3900,7 +3893,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void nextSubpass2( const VULKAN_HPP_NAMESPACE::SubpassBeginInfo * pSubpassBeginInfo,
@@ -3911,7 +3904,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void endRenderPass2( const VULKAN_HPP_NAMESPACE::SubpassEndInfo * pSubpassEndInfo,
@@ -3920,7 +3913,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_VERSION_1_3 ===
 
@@ -3933,7 +3926,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void resetEvent2( VULKAN_HPP_NAMESPACE::Event               event,
@@ -3950,7 +3943,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void pipelineBarrier2( const VULKAN_HPP_NAMESPACE::DependencyInfo * pDependencyInfo,
@@ -3959,7 +3952,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void writeTimestamp2( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stage,
@@ -3974,7 +3967,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void copyImage2( const VULKAN_HPP_NAMESPACE::CopyImageInfo2 * pCopyImageInfo,
@@ -3983,7 +3976,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void copyBufferToImage2( const VULKAN_HPP_NAMESPACE::CopyBufferToImageInfo2 * pCopyBufferToImageInfo,
@@ -3992,7 +3985,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void copyImageToBuffer2( const VULKAN_HPP_NAMESPACE::CopyImageToBufferInfo2 * pCopyImageToBufferInfo,
@@ -4001,7 +3994,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void blitImage2( const VULKAN_HPP_NAMESPACE::BlitImageInfo2 * pBlitImageInfo,
@@ -4010,7 +4003,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void resolveImage2( const VULKAN_HPP_NAMESPACE::ResolveImageInfo2 * pResolveImageInfo,
@@ -4019,7 +4012,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void beginRendering( const VULKAN_HPP_NAMESPACE::RenderingInfo * pRenderingInfo,
@@ -4028,7 +4021,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void endRendering( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
@@ -4051,7 +4044,7 @@
     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;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setScissorWithCount( uint32_t                             scissorCount,
@@ -4061,7 +4054,7 @@
     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;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void bindVertexBuffers2( uint32_t                                 firstBinding,
@@ -4080,7 +4073,7 @@
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setDepthTestEnable( VULKAN_HPP_NAMESPACE::Bool32 depthTestEnable,
@@ -4131,7 +4124,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void debugMarkerEndEXT( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
@@ -4143,7 +4136,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
     //=== VK_KHR_video_queue ===
@@ -4155,7 +4148,7 @@
     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 */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void endVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoEndCodingInfoKHR * pEndCodingInfo,
@@ -4164,7 +4157,7 @@
     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 */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void controlVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoCodingControlInfoKHR * pCodingControlInfo,
@@ -4173,7 +4166,7 @@
     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 */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_ENABLE_BETA_EXTENSIONS*/
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
@@ -4186,7 +4179,7 @@
     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 */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_ENABLE_BETA_EXTENSIONS*/
 
     //=== VK_EXT_transform_feedback ===
@@ -4206,7 +4199,7 @@
                                           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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void beginTransformFeedbackEXT( uint32_t                                 firstCounterBuffer,
@@ -4221,7 +4214,7 @@
                                     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void endTransformFeedbackEXT( uint32_t                                 firstCounterBuffer,
@@ -4236,7 +4229,7 @@
                                   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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void beginQueryIndexedEXT( VULKAN_HPP_NAMESPACE::QueryPool         queryPool,
@@ -4269,7 +4262,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_AMD_draw_indirect_count ===
 
@@ -4300,7 +4293,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void endRenderingKHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
@@ -4335,7 +4328,7 @@
                                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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void pushDescriptorSetWithTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate,
@@ -4350,7 +4343,7 @@
                                            uint32_t                                       set,
                                            DataType const &                               data,
                                            Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_conditional_rendering ===
 
@@ -4361,7 +4354,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void endConditionalRenderingEXT( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
@@ -4378,7 +4371,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_discard_rectangles ===
 
@@ -4392,7 +4385,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_create_renderpass2 ===
 
@@ -4405,7 +4398,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void nextSubpass2KHR( const VULKAN_HPP_NAMESPACE::SubpassBeginInfo * pSubpassBeginInfo,
@@ -4416,7 +4409,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void endRenderPass2KHR( const VULKAN_HPP_NAMESPACE::SubpassEndInfo * pSubpassEndInfo,
@@ -4425,7 +4418,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_debug_utils ===
 
@@ -4436,7 +4429,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void endDebugUtilsLabelEXT( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
@@ -4448,7 +4441,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_sample_locations ===
 
@@ -4459,7 +4452,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_acceleration_structure ===
 
@@ -4474,7 +4467,7 @@
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void buildAccelerationStructuresIndirectKHR( uint32_t                                                                infoCount,
@@ -4491,7 +4484,7 @@
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void copyAccelerationStructureKHR( const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureInfoKHR * pInfo,
@@ -4500,7 +4493,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void copyAccelerationStructureToMemoryKHR( const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureToMemoryInfoKHR * pInfo,
@@ -4509,7 +4502,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void copyMemoryToAccelerationStructureKHR( const VULKAN_HPP_NAMESPACE::CopyMemoryToAccelerationStructureInfoKHR * pInfo,
@@ -4518,7 +4511,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void writeAccelerationStructuresPropertiesKHR( uint32_t                                               accelerationStructureCount,
@@ -4535,7 +4528,7 @@
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_NV_shading_rate_image ===
 
@@ -4554,7 +4547,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setCoarseSampleOrderNV( VULKAN_HPP_NAMESPACE::CoarseSampleOrderTypeNV           sampleOrderType,
@@ -4566,7 +4559,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_NV_ray_tracing ===
 
@@ -4591,7 +4584,7 @@
                                        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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void copyAccelerationStructureNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV          dst,
@@ -4631,7 +4624,7 @@
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_draw_indirect_count ===
 
@@ -4695,7 +4688,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_NV_device_diagnostic_checkpoints ===
 
@@ -4705,7 +4698,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_INTEL_performance_query ===
 
@@ -4717,7 +4710,7 @@
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
       setPerformanceMarkerINTEL( const VULKAN_HPP_NAMESPACE::PerformanceMarkerInfoINTEL & markerInfo,
                                  Dispatch const & d                                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result setPerformanceStreamMarkerINTEL( const VULKAN_HPP_NAMESPACE::PerformanceStreamMarkerInfoINTEL * pMarkerInfo,
@@ -4727,7 +4720,7 @@
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
       setPerformanceStreamMarkerINTEL( const VULKAN_HPP_NAMESPACE::PerformanceStreamMarkerInfoINTEL & markerInfo,
                                        Dispatch const & d                                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result setPerformanceOverrideINTEL( const VULKAN_HPP_NAMESPACE::PerformanceOverrideInfoINTEL * pOverrideInfo,
@@ -4737,7 +4730,7 @@
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
       setPerformanceOverrideINTEL( const VULKAN_HPP_NAMESPACE::PerformanceOverrideInfoINTEL & overrideInfo,
                                    Dispatch const & d                                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_fragment_shading_rate ===
 
@@ -4750,7 +4743,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_line_rasterization ===
 
@@ -4779,7 +4772,7 @@
     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;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setScissorWithCountEXT( uint32_t                             scissorCount,
@@ -4789,7 +4782,7 @@
     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;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void bindVertexBuffers2EXT( uint32_t                                 firstBinding,
@@ -4808,7 +4801,7 @@
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setDepthTestEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthTestEnable,
@@ -4847,7 +4840,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void executeGeneratedCommandsNV( VULKAN_HPP_NAMESPACE::Bool32                          isPreprocessed,
@@ -4858,7 +4851,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void bindPipelineShaderGroupNV( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint,
@@ -4876,7 +4869,7 @@
     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 */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_ENABLE_BETA_EXTENSIONS*/
 
     //=== VK_KHR_synchronization2 ===
@@ -4890,7 +4883,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void resetEvent2KHR( VULKAN_HPP_NAMESPACE::Event               event,
@@ -4907,7 +4900,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void pipelineBarrier2KHR( const VULKAN_HPP_NAMESPACE::DependencyInfo * pDependencyInfo,
@@ -4916,7 +4909,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void writeTimestamp2KHR( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stage,
@@ -4941,7 +4934,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setDescriptorBufferOffsetsEXT( VULKAN_HPP_NAMESPACE::PipelineBindPoint  pipelineBindPoint,
@@ -4959,7 +4952,7 @@
                                         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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void bindDescriptorBufferEmbeddedSamplersEXT( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint,
@@ -5007,7 +5000,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void copyImage2KHR( const VULKAN_HPP_NAMESPACE::CopyImageInfo2 * pCopyImageInfo,
@@ -5016,7 +5009,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void copyBufferToImage2KHR( const VULKAN_HPP_NAMESPACE::CopyBufferToImageInfo2 * pCopyBufferToImageInfo,
@@ -5025,7 +5018,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void copyImageToBuffer2KHR( const VULKAN_HPP_NAMESPACE::CopyImageToBufferInfo2 * pCopyImageToBufferInfo,
@@ -5034,7 +5027,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void blitImage2KHR( const VULKAN_HPP_NAMESPACE::BlitImageInfo2 * pBlitImageInfo,
@@ -5043,7 +5036,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void resolveImage2KHR( const VULKAN_HPP_NAMESPACE::ResolveImageInfo2 * pResolveImageInfo,
@@ -5052,7 +5045,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_ray_tracing_pipeline ===
 
@@ -5075,7 +5068,7 @@
                        uint32_t                                                    height,
                        uint32_t                                                    depth,
                        Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void traceRaysIndirectKHR( const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR * pRaygenShaderBindingTable,
@@ -5092,7 +5085,7 @@
                                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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     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;
@@ -5111,7 +5104,7 @@
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_HUAWEI_subpass_shading ===
 
@@ -5155,7 +5148,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_ray_tracing_maintenance1 ===
 
@@ -5178,7 +5171,7 @@
                        uint32_t                                                                                      instanceCount,
                        uint32_t                                                                                      firstInstance,
                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void drawMultiIndexedEXT( uint32_t                                              drawCount,
@@ -5195,7 +5188,7 @@
                               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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_opacity_micromap ===
 
@@ -5207,7 +5200,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void copyMicromapEXT( const VULKAN_HPP_NAMESPACE::CopyMicromapInfoEXT * pInfo,
@@ -5216,7 +5209,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void copyMicromapToMemoryEXT( const VULKAN_HPP_NAMESPACE::CopyMicromapToMemoryInfoEXT * pInfo,
@@ -5225,7 +5218,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void copyMemoryToMicromapEXT( const VULKAN_HPP_NAMESPACE::CopyMemoryToMicromapInfoEXT * pInfo,
@@ -5234,7 +5227,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void writeMicromapsPropertiesEXT( uint32_t                                  micromapCount,
@@ -5250,7 +5243,7 @@
                                       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_NV_copy_memory_indirect ===
 
@@ -5276,7 +5269,7 @@
                                       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_NV_memory_decompression ===
 
@@ -5288,7 +5281,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void decompressMemoryIndirectCountNV( VULKAN_HPP_NAMESPACE::DeviceAddress indirectCommandsAddress,
@@ -5323,7 +5316,7 @@
     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;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setAlphaToCoverageEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 alphaToCoverageEnable,
@@ -5347,7 +5340,7 @@
     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;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setColorBlendEquationEXT( uint32_t                                            firstAttachment,
@@ -5359,7 +5352,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setColorWriteMaskEXT( uint32_t                                          firstAttachment,
@@ -5371,7 +5364,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     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;
@@ -5402,7 +5395,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setProvokingVertexModeEXT( VULKAN_HPP_NAMESPACE::ProvokingVertexModeEXT provokingVertexMode,
@@ -5434,7 +5427,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setCoverageToColorEnableNV( VULKAN_HPP_NAMESPACE::Bool32 coverageToColorEnable,
@@ -5460,7 +5453,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setShadingRateImageEnableNV( VULKAN_HPP_NAMESPACE::Bool32 shadingRateImageEnable,
@@ -5485,7 +5478,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     operator VkCommandBuffer() const VULKAN_HPP_NOEXCEPT
     {
@@ -7281,7 +7274,7 @@
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
@@ -7302,7 +7295,7 @@
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_VERSION_1_3 ===
 
@@ -7317,7 +7310,7 @@
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_swapchain ===
 
@@ -7328,7 +7321,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_debug_utils ===
 
@@ -7339,7 +7332,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void endDebugUtilsLabelEXT( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
@@ -7351,7 +7344,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_NV_device_diagnostic_checkpoints ===
 
@@ -7370,7 +7363,7 @@
               typename std::enable_if<std::is_same<typename B1::value_type, 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_INTEL_performance_query ===
 
@@ -7398,7 +7391,7 @@
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getCheckpointData2NV( uint32_t *                                pCheckpointDataCount,
@@ -7415,7 +7408,7 @@
               typename std::enable_if<std::is_same<typename B1::value_type, 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     operator VkQueue() const VULKAN_HPP_NOEXCEPT
     {
@@ -7779,7 +7772,7 @@
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
@@ -7788,7 +7781,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getQueue( uint32_t                      queueFamilyIndex,
@@ -7799,7 +7792,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
@@ -7826,8 +7819,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void freeMemory( VULKAN_HPP_NAMESPACE::DeviceMemory                memory,
@@ -7838,7 +7831,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void( free )( VULKAN_HPP_NAMESPACE::DeviceMemory                memory,
@@ -7849,7 +7842,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result mapMemory( VULKAN_HPP_NAMESPACE::DeviceMemory   memory,
@@ -7865,7 +7858,7 @@
                                                                            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 */
+#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;
@@ -7879,7 +7872,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result invalidateMappedMemoryRanges( uint32_t                                        memoryRangeCount,
@@ -7890,7 +7883,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getMemoryCommitment( VULKAN_HPP_NAMESPACE::DeviceMemory memory,
@@ -7900,7 +7893,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
@@ -7940,7 +7933,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getImageMemoryRequirements( VULKAN_HPP_NAMESPACE::Image                image,
@@ -7950,7 +7943,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getImageSparseMemoryRequirements( VULKAN_HPP_NAMESPACE::Image                           image,
@@ -7970,7 +7963,7 @@
                          getImageSparseMemoryRequirements( VULKAN_HPP_NAMESPACE::Image              image,
                                                            SparseImageMemoryRequirementsAllocator & sparseImageMemoryRequirementsAllocator,
                                                            Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result createFence( const VULKAN_HPP_NAMESPACE::FenceCreateInfo *     pCreateInfo,
@@ -7989,8 +7982,8 @@
       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 */
+#  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,
@@ -8001,7 +7994,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::Fence                       fence,
@@ -8012,7 +8005,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result resetFences( uint32_t                            fenceCount,
@@ -8022,7 +8015,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
@@ -8046,7 +8039,7 @@
                                                                      VULKAN_HPP_NAMESPACE::Bool32                                                waitAll,
                                                                      uint64_t                                                                    timeout,
                                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result createSemaphore( const VULKAN_HPP_NAMESPACE::SemaphoreCreateInfo * pCreateInfo,
@@ -8065,8 +8058,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroySemaphore( VULKAN_HPP_NAMESPACE::Semaphore                   semaphore,
@@ -8077,7 +8070,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::Semaphore                   semaphore,
@@ -8088,7 +8081,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result createEvent( const VULKAN_HPP_NAMESPACE::EventCreateInfo *     pCreateInfo,
@@ -8107,8 +8100,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyEvent( VULKAN_HPP_NAMESPACE::Event                       event,
@@ -8119,7 +8112,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::Event                       event,
@@ -8130,7 +8123,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
@@ -8178,8 +8171,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyQueryPool( VULKAN_HPP_NAMESPACE::QueryPool                   queryPool,
@@ -8190,7 +8183,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::QueryPool                   queryPool,
@@ -8201,7 +8194,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getQueryPoolResults( VULKAN_HPP_NAMESPACE::QueryPool        queryPool,
@@ -8229,7 +8222,7 @@
                                                                    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 */
+#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,
@@ -8248,8 +8241,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyBuffer( VULKAN_HPP_NAMESPACE::Buffer                      buffer,
@@ -8260,7 +8253,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::Buffer                      buffer,
@@ -8271,7 +8264,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result createBufferView( const VULKAN_HPP_NAMESPACE::BufferViewCreateInfo * pCreateInfo,
@@ -8290,8 +8283,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyBufferView( VULKAN_HPP_NAMESPACE::BufferView                  bufferView,
@@ -8302,7 +8295,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::BufferView                  bufferView,
@@ -8313,7 +8306,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result createImage( const VULKAN_HPP_NAMESPACE::ImageCreateInfo *     pCreateInfo,
@@ -8332,8 +8325,8 @@
       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 */
+#  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,
@@ -8344,7 +8337,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::Image                       image,
@@ -8355,7 +8348,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getImageSubresourceLayout( VULKAN_HPP_NAMESPACE::Image                    image,
@@ -8368,7 +8361,7 @@
                          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 */
+#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,
@@ -8387,8 +8380,8 @@
       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 */
+#  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,
@@ -8399,7 +8392,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::ImageView                   imageView,
@@ -8410,7 +8403,7 @@
     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 */
+#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,
@@ -8429,8 +8422,8 @@
       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 */
+#  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,
@@ -8441,7 +8434,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::ShaderModule                shaderModule,
@@ -8452,7 +8445,7 @@
     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 */
+#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,
@@ -8471,8 +8464,8 @@
       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 */
+#  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,
@@ -8483,7 +8476,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::PipelineCache               pipelineCache,
@@ -8494,7 +8487,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getPipelineCacheData( VULKAN_HPP_NAMESPACE::PipelineCache pipelineCache,
@@ -8513,7 +8506,7 @@
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result mergePipelineCaches( VULKAN_HPP_NAMESPACE::PipelineCache         dstCache,
@@ -8526,7 +8519,7 @@
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result createGraphicsPipelines( VULKAN_HPP_NAMESPACE::PipelineCache                      pipelineCache,
@@ -8582,8 +8575,8 @@
                                                        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 */
+#  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,
@@ -8639,8 +8632,8 @@
                                                       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 */
+#  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,
@@ -8651,7 +8644,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::Pipeline                    pipeline,
@@ -8662,7 +8655,7 @@
     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 */
+#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,
@@ -8681,8 +8674,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyPipelineLayout( VULKAN_HPP_NAMESPACE::PipelineLayout              pipelineLayout,
@@ -8693,7 +8686,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::PipelineLayout              pipelineLayout,
@@ -8704,7 +8697,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result createSampler( const VULKAN_HPP_NAMESPACE::SamplerCreateInfo *   pCreateInfo,
@@ -8723,8 +8716,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroySampler( VULKAN_HPP_NAMESPACE::Sampler                     sampler,
@@ -8735,7 +8728,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::Sampler                     sampler,
@@ -8746,7 +8739,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result createDescriptorSetLayout( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo * pCreateInfo,
@@ -8765,8 +8758,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyDescriptorSetLayout( VULKAN_HPP_NAMESPACE::DescriptorSetLayout         descriptorSetLayout,
@@ -8777,7 +8770,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::DescriptorSetLayout         descriptorSetLayout,
@@ -8788,7 +8781,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result createDescriptorPool( const VULKAN_HPP_NAMESPACE::DescriptorPoolCreateInfo * pCreateInfo,
@@ -8807,8 +8800,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyDescriptorPool( VULKAN_HPP_NAMESPACE::DescriptorPool              descriptorPool,
@@ -8819,7 +8812,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::DescriptorPool              descriptorPool,
@@ -8830,7 +8823,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
@@ -8875,8 +8868,8 @@
       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 */
+#  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,
@@ -8888,7 +8881,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     Result( free )( VULKAN_HPP_NAMESPACE::DescriptorPool        descriptorPool,
@@ -8900,7 +8893,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void updateDescriptorSets( uint32_t                                         descriptorWriteCount,
@@ -8913,7 +8906,7 @@
     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 */
+#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,
@@ -8932,8 +8925,8 @@
       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 */
+#  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,
@@ -8944,7 +8937,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::Framebuffer                 framebuffer,
@@ -8955,7 +8948,7 @@
     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 */
+#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,
@@ -8974,8 +8967,8 @@
       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 */
+#  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,
@@ -8986,7 +8979,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::RenderPass                  renderPass,
@@ -8997,7 +8990,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getRenderAreaGranularity( VULKAN_HPP_NAMESPACE::RenderPass renderPass,
@@ -9008,7 +9001,7 @@
     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 */
+#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,
@@ -9027,8 +9020,8 @@
       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 */
+#  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,
@@ -9039,7 +9032,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::CommandPool                 commandPool,
@@ -9050,7 +9043,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
@@ -9095,8 +9088,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void freeCommandBuffers( VULKAN_HPP_NAMESPACE::CommandPool           commandPool,
@@ -9108,7 +9101,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void( free )( VULKAN_HPP_NAMESPACE::CommandPool           commandPool,
@@ -9120,7 +9113,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_VERSION_1_1 ===
 
@@ -9133,7 +9126,7 @@
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result bindImageMemory2( uint32_t                                          bindInfoCount,
@@ -9144,7 +9137,7 @@
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getGroupPeerMemoryFeatures( uint32_t                                       heapIndex,
@@ -9159,7 +9152,7 @@
                                                      uint32_t           localDeviceIndex,
                                                      uint32_t           remoteDeviceIndex,
                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getImageMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 * pInfo,
@@ -9174,7 +9167,7 @@
     VULKAN_HPP_NODISCARD 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getBufferMemoryRequirements2( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 * pInfo,
@@ -9189,7 +9182,7 @@
     VULKAN_HPP_NODISCARD 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getImageSparseMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 * pInfo,
@@ -9210,7 +9203,7 @@
                          getImageSparseMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 & info,
                                                             SparseImageMemoryRequirements2Allocator &                        sparseImageMemoryRequirements2Allocator,
                                                             Dispatch const & d                                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void trimCommandPool( VULKAN_HPP_NAMESPACE::CommandPool          commandPool,
@@ -9225,7 +9218,7 @@
     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 */
+#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,
@@ -9244,8 +9237,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroySamplerYcbcrConversion( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion      ycbcrConversion,
@@ -9256,7 +9249,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion      ycbcrConversion,
@@ -9267,7 +9260,7 @@
     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 */
+#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,
@@ -9286,8 +9279,8 @@
       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 */
+#  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,
@@ -9298,7 +9291,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate    descriptorUpdateTemplate,
@@ -9309,7 +9302,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void updateDescriptorSetWithTemplate( VULKAN_HPP_NAMESPACE::DescriptorSet            descriptorSet,
@@ -9322,7 +9315,7 @@
                                           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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getDescriptorSetLayoutSupport( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo * pCreateInfo,
@@ -9337,7 +9330,7 @@
     VULKAN_HPP_NODISCARD 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_VERSION_1_2 ===
 
@@ -9358,8 +9351,8 @@
       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 */
+#  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,
@@ -9375,7 +9368,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result waitSemaphores( const VULKAN_HPP_NAMESPACE::SemaphoreWaitInfo * pWaitInfo,
@@ -9386,7 +9379,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result signalSemaphore( const VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo * pSignalInfo,
@@ -9395,7 +9388,7 @@
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
       signalSemaphore( const VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo & signalInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     DeviceAddress getBufferAddress( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo * pInfo,
@@ -9404,7 +9397,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     uint64_t getBufferOpaqueCaptureAddress( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo * pInfo,
@@ -9413,7 +9406,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     uint64_t getMemoryOpaqueCaptureAddress( const VULKAN_HPP_NAMESPACE::DeviceMemoryOpaqueCaptureAddressInfo * pInfo,
@@ -9422,7 +9415,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_VERSION_1_3 ===
 
@@ -9443,8 +9436,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyPrivateDataSlot( VULKAN_HPP_NAMESPACE::PrivateDataSlot             privateDataSlot,
@@ -9455,7 +9448,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::PrivateDataSlot             privateDataSlot,
@@ -9466,7 +9459,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
@@ -9496,7 +9489,7 @@
                                                   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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getBufferMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements * pInfo,
@@ -9511,7 +9504,7 @@
     VULKAN_HPP_NODISCARD 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getImageMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements * pInfo,
@@ -9526,7 +9519,7 @@
     VULKAN_HPP_NODISCARD 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getImageSparseMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements * pInfo,
@@ -9547,7 +9540,7 @@
                          getImageSparseMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info,
                                                            SparseImageMemoryRequirements2Allocator &                   sparseImageMemoryRequirements2Allocator,
                                                            Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_swapchain ===
 
@@ -9568,8 +9561,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroySwapchainKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR                swapchain,
@@ -9580,7 +9573,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::SwapchainKHR                swapchain,
@@ -9591,7 +9584,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getSwapchainImagesKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain,
@@ -9608,7 +9601,7 @@
               typename std::enable_if<std::is_same<typename B1::value_type, 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result acquireNextImageKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain,
@@ -9624,7 +9617,7 @@
                                                                     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getGroupPresentCapabilitiesKHR( VULKAN_HPP_NAMESPACE::DeviceGroupPresentCapabilitiesKHR * pDeviceGroupPresentCapabilities,
@@ -9633,7 +9626,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getGroupSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR                       surface,
@@ -9643,7 +9636,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result acquireNextImage2KHR( const VULKAN_HPP_NAMESPACE::AcquireNextImageInfoKHR * pAcquireInfo,
@@ -9653,7 +9646,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_display_swapchain ===
 
@@ -9704,8 +9697,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_debug_marker ===
 
@@ -9717,7 +9710,7 @@
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
       debugMarkerSetObjectTagEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerObjectTagInfoEXT & tagInfo,
                                   Dispatch const & d                                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result debugMarkerSetObjectNameEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerObjectNameInfoEXT * pNameInfo,
@@ -9727,7 +9720,7 @@
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
       debugMarkerSetObjectNameEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerObjectNameInfoEXT & nameInfo,
                                    Dispatch const & d                                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
     //=== VK_KHR_video_queue ===
@@ -9749,8 +9742,8 @@
       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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyVideoSessionKHR( VULKAN_HPP_NAMESPACE::VideoSessionKHR             videoSession,
@@ -9761,7 +9754,7 @@
     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 */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::VideoSessionKHR             videoSession,
@@ -9772,7 +9765,7 @@
     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 */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getVideoSessionMemoryRequirementsKHR( VULKAN_HPP_NAMESPACE::VideoSessionKHR                     videoSession,
@@ -9795,7 +9788,7 @@
       getVideoSessionMemoryRequirementsKHR( VULKAN_HPP_NAMESPACE::VideoSessionKHR        videoSession,
                                             VideoSessionMemoryRequirementsKHRAllocator & videoSessionMemoryRequirementsKHRAllocator,
                                             Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result bindVideoSessionMemoryKHR( VULKAN_HPP_NAMESPACE::VideoSessionKHR                       videoSession,
@@ -9808,7 +9801,7 @@
       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 */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result createVideoSessionParametersKHR( const VULKAN_HPP_NAMESPACE::VideoSessionParametersCreateInfoKHR * pCreateInfo,
@@ -9827,8 +9820,8 @@
       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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result updateVideoSessionParametersKHR( VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR                   videoSessionParameters,
@@ -9840,7 +9833,7 @@
       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 */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyVideoSessionParametersKHR( VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR   videoSessionParameters,
@@ -9851,7 +9844,7 @@
     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 */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR   videoSessionParameters,
@@ -9862,7 +9855,7 @@
     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 */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_ENABLE_BETA_EXTENSIONS*/
 
     //=== VK_NVX_binary_import ===
@@ -9884,8 +9877,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result createCuFunctionNVX( const VULKAN_HPP_NAMESPACE::CuFunctionCreateInfoNVX * pCreateInfo,
@@ -9904,8 +9897,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyCuModuleNVX( VULKAN_HPP_NAMESPACE::CuModuleNVX                 module,
@@ -9916,7 +9909,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::CuModuleNVX                 module,
@@ -9927,7 +9920,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyCuFunctionNVX( VULKAN_HPP_NAMESPACE::CuFunctionNVX               function,
@@ -9938,7 +9931,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::CuFunctionNVX               function,
@@ -9949,7 +9942,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_NVX_image_view_handle ===
 
@@ -9960,7 +9953,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getImageViewAddressNVX( VULKAN_HPP_NAMESPACE::ImageView                       imageView,
@@ -9970,7 +9963,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_AMD_shader_info ===
 
@@ -9998,7 +9991,7 @@
                         VULKAN_HPP_NAMESPACE::ShaderInfoTypeAMD   infoType,
                         Uint8_tAllocator &                        uint8_tAllocator,
                         Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
     //=== VK_NV_external_memory_win32 ===
@@ -10013,7 +10006,7 @@
     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 /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_WIN32_KHR*/
 
     //=== VK_KHR_device_group ===
@@ -10031,7 +10024,7 @@
                                                         uint32_t           localDeviceIndex,
                                                         uint32_t           remoteDeviceIndex,
                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_maintenance1 ===
 
@@ -10052,7 +10045,7 @@
     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 */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getMemoryWin32HandlePropertiesKHR( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType,
@@ -10063,7 +10056,7 @@
     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 /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_WIN32_KHR*/
 
     //=== VK_KHR_external_memory_fd ===
@@ -10076,7 +10069,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getMemoryFdPropertiesKHR( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType,
@@ -10087,7 +10080,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
     //=== VK_KHR_external_semaphore_win32 ===
@@ -10100,7 +10093,7 @@
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
       importSemaphoreWin32HandleKHR( const VULKAN_HPP_NAMESPACE::ImportSemaphoreWin32HandleInfoKHR & importSemaphoreWin32HandleInfo,
                                      Dispatch const & d                                              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getSemaphoreWin32HandleKHR( const VULKAN_HPP_NAMESPACE::SemaphoreGetWin32HandleInfoKHR * pGetWin32HandleInfo,
@@ -10111,7 +10104,7 @@
     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 /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_WIN32_KHR*/
 
     //=== VK_KHR_external_semaphore_fd ===
@@ -10124,7 +10117,7 @@
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
       importSemaphoreFdKHR( const VULKAN_HPP_NAMESPACE::ImportSemaphoreFdInfoKHR & importSemaphoreFdInfo,
                             Dispatch const & d                                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getSemaphoreFdKHR( const VULKAN_HPP_NAMESPACE::SemaphoreGetFdInfoKHR * pGetFdInfo,
@@ -10134,7 +10127,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_descriptor_update_template ===
 
@@ -10156,8 +10149,8 @@
                                                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 /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyDescriptorUpdateTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate    descriptorUpdateTemplate,
@@ -10168,7 +10161,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void updateDescriptorSetWithTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorSet            descriptorSet,
@@ -10181,7 +10174,7 @@
                                              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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_display_control ===
 
@@ -10194,7 +10187,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result registerEventEXT( const VULKAN_HPP_NAMESPACE::DeviceEventInfoEXT *  pDeviceEventInfo,
@@ -10213,8 +10206,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result registerDisplayEventEXT( VULKAN_HPP_NAMESPACE::DisplayKHR                  display,
@@ -10236,8 +10229,8 @@
                                      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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getSwapchainCounterEXT( VULKAN_HPP_NAMESPACE::SwapchainKHR              swapchain,
@@ -10249,7 +10242,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_GOOGLE_display_timing ===
 
@@ -10261,7 +10254,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getPastPresentationTimingGOOGLE( VULKAN_HPP_NAMESPACE::SwapchainKHR                   swapchain,
@@ -10281,7 +10274,7 @@
       getPastPresentationTimingGOOGLE( VULKAN_HPP_NAMESPACE::SwapchainKHR      swapchain,
                                        PastPresentationTimingGOOGLEAllocator & pastPresentationTimingGOOGLEAllocator,
                                        Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_hdr_metadata ===
 
@@ -10295,7 +10288,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_create_renderpass2 ===
 
@@ -10316,8 +10309,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_shared_presentable_image ===
 
@@ -10342,7 +10335,7 @@
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
       importFenceWin32HandleKHR( const VULKAN_HPP_NAMESPACE::ImportFenceWin32HandleInfoKHR & importFenceWin32HandleInfo,
                                  Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getFenceWin32HandleKHR( const VULKAN_HPP_NAMESPACE::FenceGetWin32HandleInfoKHR * pGetWin32HandleInfo,
@@ -10353,7 +10346,7 @@
     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 /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_WIN32_KHR*/
 
     //=== VK_KHR_external_fence_fd ===
@@ -10366,7 +10359,7 @@
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
       importFenceFdKHR( const VULKAN_HPP_NAMESPACE::ImportFenceFdInfoKHR & importFenceFdInfo,
                         Dispatch const & d                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getFenceFdKHR( const VULKAN_HPP_NAMESPACE::FenceGetFdInfoKHR * pGetFdInfo,
@@ -10376,7 +10369,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_performance_query ===
 
@@ -10388,7 +10381,7 @@
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
       acquireProfilingLockKHR( const VULKAN_HPP_NAMESPACE::AcquireProfilingLockInfoKHR & info,
                                Dispatch const & d                                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void releaseProfilingLockKHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
@@ -10403,7 +10396,7 @@
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
       setDebugUtilsObjectNameEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsObjectNameInfoEXT & nameInfo,
                                   Dispatch const & d                                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result setDebugUtilsObjectTagEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsObjectTagInfoEXT * pTagInfo,
@@ -10413,7 +10406,7 @@
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
       setDebugUtilsObjectTagEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsObjectTagInfoEXT & tagInfo,
                                  Dispatch const & d                                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
     //=== VK_ANDROID_external_memory_android_hardware_buffer ===
@@ -10430,7 +10423,7 @@
     template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<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 */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getMemoryAndroidHardwareBufferANDROID( const VULKAN_HPP_NAMESPACE::MemoryGetAndroidHardwareBufferInfoANDROID * pInfo,
@@ -10441,7 +10434,7 @@
     VULKAN_HPP_NODISCARD typename ResultValueType<struct AHardwareBuffer *>::type
       getMemoryAndroidHardwareBufferANDROID( const VULKAN_HPP_NAMESPACE::MemoryGetAndroidHardwareBufferInfoANDROID & info,
                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_ANDROID_KHR*/
 
     //=== VK_KHR_get_memory_requirements2 ===
@@ -10459,7 +10452,7 @@
     VULKAN_HPP_NODISCARD 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getBufferMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 * pInfo,
@@ -10474,7 +10467,7 @@
     VULKAN_HPP_NODISCARD 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getImageSparseMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 * pInfo,
@@ -10495,7 +10488,7 @@
                          getImageSparseMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 & info,
                                                                SparseImageMemoryRequirements2Allocator &                        sparseImageMemoryRequirements2Allocator,
                                                                Dispatch const & d                                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_acceleration_structure ===
 
@@ -10516,8 +10509,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR    accelerationStructure,
@@ -10528,7 +10521,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR    accelerationStructure,
@@ -10539,7 +10532,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result buildAccelerationStructuresKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                                   deferredOperation,
@@ -10554,7 +10547,7 @@
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result copyAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                     deferredOperation,
@@ -10565,7 +10558,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result copyAccelerationStructureToMemoryKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                             deferredOperation,
@@ -10577,7 +10570,7 @@
                          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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result copyMemoryToAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                             deferredOperation,
@@ -10589,7 +10582,7 @@
                          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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result
@@ -10614,7 +10607,7 @@
       VULKAN_HPP_NAMESPACE::QueryType                                                                queryType,
       size_t                                                                                         stride,
       Dispatch const & d                                                                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     DeviceAddress getAccelerationStructureAddressKHR( const VULKAN_HPP_NAMESPACE::AccelerationStructureDeviceAddressInfoKHR * pInfo,
@@ -10624,7 +10617,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getAccelerationStructureCompatibilityKHR( const VULKAN_HPP_NAMESPACE::AccelerationStructureVersionInfoKHR * pVersionInfo,
@@ -10635,7 +10628,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getAccelerationStructureBuildSizesKHR( VULKAN_HPP_NAMESPACE::AccelerationStructureBuildTypeKHR                 buildType,
@@ -10650,7 +10643,7 @@
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_sampler_ycbcr_conversion ===
 
@@ -10671,8 +10664,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroySamplerYcbcrConversionKHR( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion      ycbcrConversion,
@@ -10683,7 +10676,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_bind_memory2 ===
 
@@ -10696,7 +10689,7 @@
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result bindImageMemory2KHR( uint32_t                                          bindInfoCount,
@@ -10707,7 +10700,7 @@
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_image_drm_format_modifier ===
 
@@ -10719,7 +10712,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_validation_cache ===
 
@@ -10740,8 +10733,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyValidationCacheEXT( VULKAN_HPP_NAMESPACE::ValidationCacheEXT          validationCache,
@@ -10752,7 +10745,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::ValidationCacheEXT          validationCache,
@@ -10763,7 +10756,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result mergeValidationCachesEXT( VULKAN_HPP_NAMESPACE::ValidationCacheEXT         dstCache,
@@ -10776,7 +10769,7 @@
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getValidationCacheDataEXT( VULKAN_HPP_NAMESPACE::ValidationCacheEXT validationCache,
@@ -10795,7 +10788,7 @@
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_NV_ray_tracing ===
 
@@ -10816,8 +10809,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyAccelerationStructureNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV     accelerationStructure,
@@ -10828,7 +10821,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::AccelerationStructureNV     accelerationStructure,
@@ -10839,7 +10832,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getAccelerationStructureMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::AccelerationStructureMemoryRequirementsInfoNV * pInfo,
@@ -10854,7 +10847,7 @@
     VULKAN_HPP_NODISCARD 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result bindAccelerationStructureMemoryNV( uint32_t                                                            bindInfoCount,
@@ -10865,7 +10858,7 @@
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result createRayTracingPipelinesNV( VULKAN_HPP_NAMESPACE::PipelineCache                          pipelineCache,
@@ -10921,8 +10914,8 @@
                                                            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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getRayTracingShaderGroupHandlesNV( VULKAN_HPP_NAMESPACE::Pipeline pipeline,
@@ -10942,7 +10935,7 @@
     template <typename DataType, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type getRayTracingShaderGroupHandleNV(
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getAccelerationStructureHandleNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV accelerationStructure,
@@ -10957,7 +10950,7 @@
     VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
       getAccelerationStructureHandleNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV accelerationStructure,
                                         Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
@@ -10985,7 +10978,7 @@
     VULKAN_HPP_NODISCARD 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_external_memory_host ===
 
@@ -11000,7 +10993,7 @@
       getMemoryHostPointerPropertiesEXT( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType,
                                          const void *                                           pHostPointer,
                                          Dispatch const & d                                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_calibrated_timestamps ===
 
@@ -11027,7 +11020,7 @@
     VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<uint64_t, uint64_t>>::type
       getCalibratedTimestampEXT( const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoEXT & timestampInfo,
                                  Dispatch const & d                                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_timeline_semaphore ===
 
@@ -11039,7 +11032,7 @@
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<uint64_t>::type
       getSemaphoreCounterValueKHR( VULKAN_HPP_NAMESPACE::Semaphore semaphore, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result waitSemaphoresKHR( const VULKAN_HPP_NAMESPACE::SemaphoreWaitInfo * pWaitInfo,
@@ -11050,7 +11043,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result signalSemaphoreKHR( const VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo * pSignalInfo,
@@ -11059,7 +11052,7 @@
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
       signalSemaphoreKHR( const VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo & signalInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_INTEL_performance_query ===
 
@@ -11071,7 +11064,7 @@
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
       initializePerformanceApiINTEL( const VULKAN_HPP_NAMESPACE::InitializePerformanceApiInfoINTEL & initializeInfo,
                                      Dispatch const & d                                              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void uninitializePerformanceApiINTEL( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
@@ -11090,8 +11083,8 @@
     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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
@@ -11123,7 +11116,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_AMD_display_native_hdr ===
 
@@ -11141,7 +11134,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_present_wait ===
 
@@ -11191,7 +11184,7 @@
     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 /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_WIN32_KHR*/
 
     //=== VK_KHR_buffer_device_address ===
@@ -11203,7 +11196,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     uint64_t getBufferOpaqueCaptureAddressKHR( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo * pInfo,
@@ -11212,7 +11205,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     uint64_t getMemoryOpaqueCaptureAddressKHR( const VULKAN_HPP_NAMESPACE::DeviceMemoryOpaqueCaptureAddressInfo * pInfo,
@@ -11221,7 +11214,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_host_query_reset ===
 
@@ -11247,8 +11240,8 @@
     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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyDeferredOperationKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR        operation,
@@ -11259,7 +11252,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::DeferredOperationKHR        operation,
@@ -11270,7 +11263,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     uint32_t getDeferredOperationMaxConcurrencyKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR operation,
@@ -11320,7 +11313,7 @@
       getPipelineExecutablePropertiesKHR( const VULKAN_HPP_NAMESPACE::PipelineInfoKHR & pipelineInfo,
                                           PipelineExecutablePropertiesKHRAllocator &    pipelineExecutablePropertiesKHRAllocator,
                                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getPipelineExecutableStatisticsKHR( const VULKAN_HPP_NAMESPACE::PipelineExecutableInfoKHR * pExecutableInfo,
@@ -11343,7 +11336,7 @@
       getPipelineExecutableStatisticsKHR( const VULKAN_HPP_NAMESPACE::PipelineExecutableInfoKHR & executableInfo,
                                           PipelineExecutableStatisticKHRAllocator &               pipelineExecutableStatisticKHRAllocator,
                                           Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result
@@ -11368,7 +11361,7 @@
         const VULKAN_HPP_NAMESPACE::PipelineExecutableInfoKHR & executableInfo,
         PipelineExecutableInternalRepresentationKHRAllocator &  pipelineExecutableInternalRepresentationKHRAllocator,
         Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_NV_device_generated_commands ===
 
@@ -11385,7 +11378,7 @@
     VULKAN_HPP_NODISCARD 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result createIndirectCommandsLayoutNV( const VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutCreateInfoNV * pCreateInfo,
@@ -11404,8 +11397,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyIndirectCommandsLayoutNV( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV    indirectCommandsLayout,
@@ -11416,7 +11409,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV    indirectCommandsLayout,
@@ -11427,7 +11420,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_private_data ===
 
@@ -11448,8 +11441,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyPrivateDataSlotEXT( VULKAN_HPP_NAMESPACE::PrivateDataSlot             privateDataSlot,
@@ -11460,7 +11453,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
@@ -11490,7 +11483,7 @@
                                                      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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_METAL_EXT )
     //=== VK_EXT_metal_objects ===
@@ -11505,7 +11498,7 @@
     template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
                          exportMetalObjectsEXT( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_METAL_EXT*/
 
     //=== VK_EXT_descriptor_buffer ===
@@ -11519,7 +11512,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getDescriptorSetLayoutBindingOffsetEXT( VULKAN_HPP_NAMESPACE::DescriptorSetLayout layout,
@@ -11532,7 +11525,7 @@
                          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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getDescriptorEXT( const VULKAN_HPP_NAMESPACE::DescriptorGetInfoEXT * pDescriptorInfo,
@@ -11543,7 +11536,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result
@@ -11555,7 +11548,7 @@
     VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
       getBufferOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::BufferCaptureDescriptorDataInfoEXT & info,
                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getImageOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::ImageCaptureDescriptorDataInfoEXT * pInfo,
@@ -11566,7 +11559,7 @@
     VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
       getImageOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::ImageCaptureDescriptorDataInfoEXT & info,
                                               Dispatch const & d                                              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result
@@ -11578,7 +11571,7 @@
     VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
       getImageViewOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::ImageViewCaptureDescriptorDataInfoEXT & info,
                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result
@@ -11590,7 +11583,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result
@@ -11602,7 +11595,7 @@
     VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
       getAccelerationStructureOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::AccelerationStructureCaptureDescriptorDataInfoEXT & info,
                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_image_compression_control ===
 
@@ -11622,7 +11615,7 @@
                          getImageSubresourceLayout2EXT( VULKAN_HPP_NAMESPACE::Image                        image,
                                                         const VULKAN_HPP_NAMESPACE::ImageSubresource2EXT & subresource,
                                                         Dispatch const & d                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_device_fault ===
 
@@ -11634,7 +11627,7 @@
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD ResultValue<std::pair<VULKAN_HPP_NAMESPACE::DeviceFaultCountsEXT, VULKAN_HPP_NAMESPACE::DeviceFaultInfoEXT>>
                          getFaultInfoEXT( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_ray_tracing_pipeline ===
 
@@ -11699,8 +11692,8 @@
                                                             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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getRayTracingShaderGroupHandlesKHR( VULKAN_HPP_NAMESPACE::Pipeline pipeline,
@@ -11720,7 +11713,7 @@
     template <typename DataType, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type getRayTracingShaderGroupHandleKHR(
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result
@@ -11741,7 +11734,7 @@
     template <typename DataType, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type getRayTracingCaptureReplayShaderGroupHandleKHR(
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     DeviceSize getRayTracingShaderGroupStackSizeKHR( VULKAN_HPP_NAMESPACE::Pipeline             pipeline,
@@ -11761,7 +11754,7 @@
     VULKAN_HPP_NODISCARD typename ResultValueType<zx_handle_t>::type
       getMemoryZirconHandleFUCHSIA( const VULKAN_HPP_NAMESPACE::MemoryGetZirconHandleInfoFUCHSIA & getZirconHandleInfo,
                                     Dispatch const & d                                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result
@@ -11775,7 +11768,7 @@
       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 /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_FUCHSIA*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
@@ -11790,7 +11783,7 @@
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
       importSemaphoreZirconHandleFUCHSIA( const VULKAN_HPP_NAMESPACE::ImportSemaphoreZirconHandleInfoFUCHSIA & importSemaphoreZirconHandleInfo,
                                           Dispatch const & d                                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getSemaphoreZirconHandleFUCHSIA( const VULKAN_HPP_NAMESPACE::SemaphoreGetZirconHandleInfoFUCHSIA * pGetZirconHandleInfo,
@@ -11801,7 +11794,7 @@
     VULKAN_HPP_NODISCARD typename ResultValueType<zx_handle_t>::type
       getSemaphoreZirconHandleFUCHSIA( const VULKAN_HPP_NAMESPACE::SemaphoreGetZirconHandleInfoFUCHSIA & getZirconHandleInfo,
                                        Dispatch const & d                                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_FUCHSIA*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
@@ -11824,8 +11817,8 @@
       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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result
@@ -11838,7 +11831,7 @@
       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 */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result
@@ -11851,7 +11844,7 @@
       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 */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyBufferCollectionFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA     collection,
@@ -11862,7 +11855,7 @@
     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 */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA     collection,
@@ -11873,7 +11866,7 @@
     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 */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getBufferCollectionPropertiesFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA             collection,
@@ -11884,7 +11877,7 @@
     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 /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_FUCHSIA*/
 
     //=== VK_HUAWEI_subpass_shading ===
@@ -11898,7 +11891,7 @@
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD ResultValue<VULKAN_HPP_NAMESPACE::Extent2D>
       getSubpassShadingMaxWorkgroupSizeHUAWEI( VULKAN_HPP_NAMESPACE::RenderPass renderpass, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_NV_external_memory_rdma ===
 
@@ -11911,7 +11904,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_pipeline_properties ===
 
@@ -11923,7 +11916,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_opacity_micromap ===
 
@@ -11944,8 +11937,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyMicromapEXT( VULKAN_HPP_NAMESPACE::MicromapEXT                 micromap,
@@ -11956,7 +11949,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::MicromapEXT                 micromap,
@@ -11967,7 +11960,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result buildMicromapsEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR         deferredOperation,
@@ -11980,7 +11973,7 @@
                          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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result copyMicromapEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR        deferredOperation,
@@ -11991,7 +11984,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result copyMicromapToMemoryEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                deferredOperation,
@@ -12002,7 +11995,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result copyMemoryToMicromapEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                deferredOperation,
@@ -12013,7 +12006,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result writeMicromapsPropertiesEXT( uint32_t                                  micromapCount,
@@ -12037,7 +12030,7 @@
                                  VULKAN_HPP_NAMESPACE::QueryType                                                   queryType,
                                  size_t                                                                            stride,
                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getMicromapCompatibilityEXT( const VULKAN_HPP_NAMESPACE::MicromapVersionInfoEXT *          pVersionInfo,
@@ -12048,7 +12041,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getMicromapBuildSizesEXT( VULKAN_HPP_NAMESPACE::AccelerationStructureBuildTypeKHR buildType,
@@ -12061,7 +12054,7 @@
                          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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_pageable_device_local_memory ===
 
@@ -12085,7 +12078,7 @@
     VULKAN_HPP_NODISCARD 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getImageMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements * pInfo,
@@ -12100,7 +12093,7 @@
     VULKAN_HPP_NODISCARD 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getImageSparseMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements * pInfo,
@@ -12121,7 +12114,7 @@
                          getImageSparseMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info,
                                                               SparseImageMemoryRequirements2Allocator &                   sparseImageMemoryRequirements2Allocator,
                                                               Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_VALVE_descriptor_set_host_mapping ===
 
@@ -12134,7 +12127,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getDescriptorSetHostMappingVALVE( VULKAN_HPP_NAMESPACE::DescriptorSet descriptorSet,
@@ -12144,7 +12137,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_shader_module_identifier ===
 
@@ -12157,7 +12150,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getShaderModuleCreateInfoIdentifierEXT( const VULKAN_HPP_NAMESPACE::ShaderModuleCreateInfo * pCreateInfo,
@@ -12168,7 +12161,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_NV_optical_flow ===
 
@@ -12189,8 +12182,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyOpticalFlowSessionNV( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV        session,
@@ -12201,7 +12194,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV        session,
@@ -12212,7 +12205,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
@@ -12251,7 +12244,7 @@
       getFramebufferTilePropertiesQCOM( VULKAN_HPP_NAMESPACE::Framebuffer framebuffer,
                                         TilePropertiesQCOMAllocator &     tilePropertiesQCOMAllocator,
                                         Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     Result getDynamicRenderingTilePropertiesQCOM( const VULKAN_HPP_NAMESPACE::RenderingInfo * pRenderingInfo,
@@ -12262,7 +12255,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     operator VkDevice() const VULKAN_HPP_NOEXCEPT
     {
@@ -12451,7 +12444,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getFormatProperties( VULKAN_HPP_NAMESPACE::Format             format,
@@ -12461,7 +12454,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getImageFormatProperties( VULKAN_HPP_NAMESPACE::Format                  format,
@@ -12480,7 +12473,7 @@
                                 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getProperties( VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties * pProperties,
@@ -12489,7 +12482,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getQueueFamilyProperties( uint32_t *                                    pQueueFamilyPropertyCount,
@@ -12507,7 +12500,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getMemoryProperties( VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties * pMemoryProperties,
@@ -12516,7 +12509,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result createDevice( const VULKAN_HPP_NAMESPACE::DeviceCreateInfo *    pCreateInfo,
@@ -12535,8 +12528,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result enumerateDeviceExtensionProperties( const char *                                pLayerName,
@@ -12557,7 +12550,7 @@
       enumerateDeviceExtensionProperties( Optional<const std::string>    layerName,
                                           ExtensionPropertiesAllocator & extensionPropertiesAllocator,
                                           Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result enumerateDeviceLayerProperties( uint32_t *                              pPropertyCount,
@@ -12573,7 +12566,7 @@
               typename std::enable_if<std::is_same<typename B1::value_type, 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getSparseImageFormatProperties( VULKAN_HPP_NAMESPACE::Format                        format,
@@ -12606,7 +12599,7 @@
                                                          VULKAN_HPP_NAMESPACE::ImageTiling         tiling,
                                                          SparseImageFormatPropertiesAllocator &    sparseImageFormatPropertiesAllocator,
                                                          Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_VERSION_1_1 ===
 
@@ -12619,7 +12612,7 @@
                          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 StructureChain<X, Y, Z...> getFeatures2( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getProperties2( VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 * pProperties,
@@ -12630,7 +12623,7 @@
                          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 StructureChain<X, Y, Z...> getProperties2( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getFormatProperties2( VULKAN_HPP_NAMESPACE::Format              format,
@@ -12643,7 +12636,7 @@
     template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getImageFormatProperties2( const VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 * pImageFormatInfo,
@@ -12658,7 +12651,7 @@
     VULKAN_HPP_NODISCARD typename ResultValueType<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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getQueueFamilyProperties2( uint32_t *                                     pQueueFamilyPropertyCount,
@@ -12688,7 +12681,7 @@
               typename std::enable_if<std::is_same<typename B1::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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getMemoryProperties2( VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2 * pMemoryProperties,
@@ -12700,7 +12693,7 @@
     template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
                          getMemoryProperties2( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getSparseImageFormatProperties2( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 * pFormatInfo,
@@ -12721,7 +12714,7 @@
                          getSparseImageFormatProperties2( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 & formatInfo,
                                                           SparseImageFormatProperties2Allocator &                            sparseImageFormatProperties2Allocator,
                                                           Dispatch const & d                                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getExternalBufferProperties( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalBufferInfo * pExternalBufferInfo,
@@ -12732,7 +12725,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getExternalFenceProperties( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalFenceInfo * pExternalFenceInfo,
@@ -12743,7 +12736,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getExternalSemaphoreProperties( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalSemaphoreInfo * pExternalSemaphoreInfo,
@@ -12754,7 +12747,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_VERSION_1_3 ===
 
@@ -12774,7 +12767,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_surface ===
 
@@ -12787,7 +12780,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getSurfaceCapabilitiesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR               surface,
@@ -12797,7 +12790,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getSurfaceFormatsKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR         surface,
@@ -12818,7 +12811,7 @@
       getSurfaceFormatsKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface,
                             SurfaceFormatKHRAllocator &      surfaceFormatKHRAllocator,
                             Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR       surface,
@@ -12838,7 +12831,7 @@
       getSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface,
                                  PresentModeKHRAllocator &        presentModeKHRAllocator,
                                  Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_swapchain ===
 
@@ -12857,7 +12850,7 @@
               typename std::enable_if<std::is_same<typename B1::value_type, 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_display ===
 
@@ -12877,7 +12870,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getDisplayPlanePropertiesKHR( uint32_t *                                        pPropertyCount,
@@ -12895,7 +12888,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getDisplayPlaneSupportedDisplaysKHR( uint32_t                           planeIndex,
@@ -12912,7 +12905,7 @@
               typename std::enable_if<std::is_same<typename B1::value_type, 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getDisplayModePropertiesKHR( VULKAN_HPP_NAMESPACE::DisplayKHR                 display,
@@ -12932,7 +12925,7 @@
       getDisplayModePropertiesKHR( VULKAN_HPP_NAMESPACE::DisplayKHR    display,
                                    DisplayModePropertiesKHRAllocator & displayModePropertiesKHRAllocator,
                                    Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result createDisplayModeKHR( VULKAN_HPP_NAMESPACE::DisplayKHR                       display,
@@ -12954,8 +12947,8 @@
                                   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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getDisplayPlaneCapabilitiesKHR( VULKAN_HPP_NAMESPACE::DisplayModeKHR                mode,
@@ -12966,7 +12959,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_XLIB_KHR )
     //=== VK_KHR_xlib_surface ===
@@ -12982,7 +12975,7 @@
                                                                 Display &          dpy,
                                                                 VisualID           visualID,
                                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_XLIB_KHR*/
 
 #if defined( VK_USE_PLATFORM_XCB_KHR )
@@ -12999,7 +12992,7 @@
                                                                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 /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_XCB_KHR*/
 
 #if defined( VK_USE_PLATFORM_WAYLAND_KHR )
@@ -13014,7 +13007,7 @@
     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 /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_WAYLAND_KHR*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
@@ -13040,7 +13033,7 @@
     VULKAN_HPP_NODISCARD typename ResultValueType<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 */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getVideoFormatPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoFormatInfoKHR * pVideoFormatInfo,
@@ -13061,7 +13054,7 @@
       getVideoFormatPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoFormatInfoKHR & videoFormatInfo,
                                    VideoFormatPropertiesKHRAllocator &                            videoFormatPropertiesKHRAllocator,
                                    Dispatch const & d                                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_ENABLE_BETA_EXTENSIONS*/
 
     //=== VK_NV_external_memory_capabilities ===
@@ -13085,7 +13078,7 @@
                                           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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_get_physical_device_properties2 ===
 
@@ -13098,7 +13091,7 @@
                          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 StructureChain<X, Y, Z...> getFeatures2KHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getProperties2KHR( VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 * pProperties,
@@ -13109,7 +13102,7 @@
                          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 StructureChain<X, Y, Z...> getProperties2KHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getFormatProperties2KHR( VULKAN_HPP_NAMESPACE::Format              format,
@@ -13122,7 +13115,7 @@
     template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getImageFormatProperties2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 * pImageFormatInfo,
@@ -13137,7 +13130,7 @@
     VULKAN_HPP_NODISCARD typename ResultValueType<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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getQueueFamilyProperties2KHR( uint32_t *                                     pQueueFamilyPropertyCount,
@@ -13167,7 +13160,7 @@
               typename std::enable_if<std::is_same<typename B1::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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getMemoryProperties2KHR( VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2 * pMemoryProperties,
@@ -13179,7 +13172,7 @@
     template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
                          getMemoryProperties2KHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getSparseImageFormatProperties2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 * pFormatInfo,
@@ -13200,7 +13193,7 @@
                          getSparseImageFormatProperties2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 & formatInfo,
                                                              SparseImageFormatProperties2Allocator &                            sparseImageFormatProperties2Allocator,
                                                              Dispatch const & d                                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_external_memory_capabilities ===
 
@@ -13213,7 +13206,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_external_semaphore_capabilities ===
 
@@ -13226,7 +13219,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_direct_mode_display ===
 
@@ -13249,7 +13242,7 @@
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
       acquireXlibDisplayEXT( Display & dpy, VULKAN_HPP_NAMESPACE::DisplayKHR display, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getRandROutputDisplayEXT( Display *                          dpy,
@@ -13264,8 +13257,8 @@
     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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_XLIB_XRANDR_EXT*/
 
     //=== VK_EXT_display_surface_counter ===
@@ -13278,7 +13271,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_external_fence_capabilities ===
 
@@ -13291,7 +13284,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_performance_query ===
 
@@ -13325,7 +13318,7 @@
                                                        PerformanceCounterKHRAllocator &            performanceCounterKHRAllocator,
                                                        PerformanceCounterDescriptionKHRAllocator & performanceCounterDescriptionKHRAllocator,
                                                        Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void getQueueFamilyPerformanceQueryPassesKHR( const VULKAN_HPP_NAMESPACE::QueryPoolPerformanceCreateInfoKHR * pPerformanceQueryCreateInfo,
@@ -13336,7 +13329,7 @@
     VULKAN_HPP_NODISCARD uint32_t
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_get_surface_capabilities2 ===
 
@@ -13353,7 +13346,7 @@
     VULKAN_HPP_NODISCARD typename ResultValueType<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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getSurfaceFormats2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
@@ -13389,7 +13382,7 @@
       getSurfaceFormats2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo,
                              StructureChainAllocator &                                   structureChainAllocator,
                              Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_get_display_properties2 ===
 
@@ -13409,7 +13402,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getDisplayPlaneProperties2KHR( uint32_t *                                         pPropertyCount,
@@ -13427,7 +13420,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getDisplayModeProperties2KHR( VULKAN_HPP_NAMESPACE::DisplayKHR                  display,
@@ -13447,7 +13440,7 @@
       getDisplayModeProperties2KHR( VULKAN_HPP_NAMESPACE::DisplayKHR     display,
                                     DisplayModeProperties2KHRAllocator & displayModeProperties2KHRAllocator,
                                     Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result getDisplayPlaneCapabilities2KHR( const VULKAN_HPP_NAMESPACE::DisplayPlaneInfo2KHR *   pDisplayPlaneInfo,
@@ -13458,7 +13451,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_sample_locations ===
 
@@ -13471,7 +13464,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_calibrated_timestamps ===
 
@@ -13489,7 +13482,7 @@
               typename std::enable_if<std::is_same<typename B1::value_type, TimeDomainEXT>::value, int>::type = 0>
     VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::TimeDomainEXT, TimeDomainEXTAllocator>>::type
       getCalibrateableTimeDomainsEXT( TimeDomainEXTAllocator & timeDomainEXTAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_fragment_shading_rate ===
 
@@ -13511,7 +13504,7 @@
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_EXT_tooling_info ===
 
@@ -13531,7 +13524,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_NV_cooperative_matrix ===
 
@@ -13553,7 +13546,7 @@
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_NV_coverage_reduction_mode ===
 
@@ -13576,7 +13569,7 @@
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
     //=== VK_EXT_full_screen_exclusive ===
@@ -13599,7 +13592,7 @@
       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 /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_WIN32_KHR*/
 
     //=== VK_EXT_acquire_drm_display ===
@@ -13628,8 +13621,8 @@
     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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
     //=== VK_NV_acquire_winrt_display ===
@@ -13656,8 +13649,8 @@
     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 */
+#    endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_WIN32_KHR*/
 
 #if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
@@ -13672,7 +13665,7 @@
     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 /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_DIRECTFB_EXT*/
 
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
@@ -13687,7 +13680,7 @@
     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 /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_USE_PLATFORM_SCREEN_QNX*/
 
     //=== VK_NV_optical_flow ===
@@ -13713,7 +13706,7 @@
       getOpticalFlowImageFormatsNV( const VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatInfoNV & opticalFlowImageFormatInfo,
                                     OpticalFlowImageFormatPropertiesNVAllocator &              opticalFlowImageFormatPropertiesNVAllocator,
                                     Dispatch const & d                                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     operator VkPhysicalDevice() const VULKAN_HPP_NOEXCEPT
     {
@@ -13832,7 +13825,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result enumeratePhysicalDevices( uint32_t *                             pPhysicalDeviceCount,
@@ -13848,14 +13841,14 @@
               typename std::enable_if<std::is_same<typename B1::value_type, 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     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
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_VERSION_1_1 ===
 
@@ -13877,7 +13870,7 @@
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_surface ===
 
@@ -13890,7 +13883,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::SurfaceKHR                  surface,
@@ -13901,7 +13894,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_display ===
 
@@ -13922,8 +13915,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_XLIB_KHR )
     //=== VK_KHR_xlib_surface ===
@@ -13945,8 +13938,8 @@
       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 /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_XLIB_KHR*/
 
 #if defined( VK_USE_PLATFORM_XCB_KHR )
@@ -13969,8 +13962,8 @@
       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 /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_XCB_KHR*/
 
 #if defined( VK_USE_PLATFORM_WAYLAND_KHR )
@@ -13993,8 +13986,8 @@
       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 /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_WAYLAND_KHR*/
 
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
@@ -14017,8 +14010,8 @@
       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 /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_ANDROID_KHR*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
@@ -14041,8 +14034,8 @@
       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 /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_WIN32_KHR*/
 
     //=== VK_EXT_debug_report ===
@@ -14064,8 +14057,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyDebugReportCallbackEXT( VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT      callback,
@@ -14076,7 +14069,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT      callback,
@@ -14087,7 +14080,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void debugReportMessageEXT( VULKAN_HPP_NAMESPACE::DebugReportFlagsEXT      flags,
@@ -14108,7 +14101,7 @@
                                 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_GGP )
     //=== VK_GGP_stream_descriptor_surface ===
@@ -14130,8 +14123,8 @@
       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 /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_GGP*/
 
 #if defined( VK_USE_PLATFORM_VI_NN )
@@ -14154,8 +14147,8 @@
       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 /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_VI_NN*/
 
     //=== VK_KHR_device_group_creation ===
@@ -14178,7 +14171,7 @@
       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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_IOS_MVK )
     //=== VK_MVK_ios_surface ===
@@ -14200,8 +14193,8 @@
       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 /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_IOS_MVK*/
 
 #if defined( VK_USE_PLATFORM_MACOS_MVK )
@@ -14224,8 +14217,8 @@
       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 /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_MACOS_MVK*/
 
     //=== VK_EXT_debug_utils ===
@@ -14247,8 +14240,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroyDebugUtilsMessengerEXT( VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT      messenger,
@@ -14259,7 +14252,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void destroy( VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT      messenger,
@@ -14270,7 +14263,7 @@
     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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void submitDebugUtilsMessageEXT( VULKAN_HPP_NAMESPACE::DebugUtilsMessageSeverityFlagBitsEXT       messageSeverity,
@@ -14283,7 +14276,7 @@
                                      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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
     //=== VK_FUCHSIA_imagepipe_surface ===
@@ -14305,8 +14298,8 @@
       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 /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_FUCHSIA*/
 
 #if defined( VK_USE_PLATFORM_METAL_EXT )
@@ -14329,8 +14322,8 @@
       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 /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_METAL_EXT*/
 
     //=== VK_EXT_headless_surface ===
@@ -14352,8 +14345,8 @@
       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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
     //=== VK_EXT_directfb_surface ===
@@ -14375,8 +14368,8 @@
       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 /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_DIRECTFB_EXT*/
 
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
@@ -14399,8 +14392,8 @@
       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 /*VULKAN_HPP_NO_SMART_HANDLE*/
+#  endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif     /*VK_USE_PLATFORM_SCREEN_QNX*/
 
     operator VkInstance() const VULKAN_HPP_NOEXCEPT
@@ -14469,8 +14462,8 @@
     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 */
+#  endif /*VULKAN_HPP_NO_SMART_HANDLE*/
+#endif   /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
   VULKAN_HPP_NODISCARD Result enumerateInstanceExtensionProperties( const char *                                pLayerName,
@@ -14491,7 +14484,7 @@
     enumerateInstanceExtensionProperties( Optional<const std::string>    layerName,
                                           ExtensionPropertiesAllocator & extensionPropertiesAllocator,
                                           Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT );
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
   VULKAN_HPP_NODISCARD Result enumerateInstanceLayerProperties( uint32_t *                              pPropertyCount,
@@ -14507,7 +14500,7 @@
             typename std::enable_if<std::is_same<typename B1::value_type, 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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_VERSION_1_1 ===
 
@@ -14517,7 +14510,7 @@
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
   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 */
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 }  // namespace VULKAN_HPP_NAMESPACE
 #endif
diff --git a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_hash.hpp b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_hash.hpp
index eaf489f..f28a3f1 100644
--- a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_hash.hpp
+++ b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_hash.hpp
@@ -3657,35 +3657,6 @@
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DirectDriverLoadingInfoLUNARG>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DirectDriverLoadingInfoLUNARG const & directDriverLoadingInfoLUNARG ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, directDriverLoadingInfoLUNARG.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, directDriverLoadingInfoLUNARG.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, directDriverLoadingInfoLUNARG.flags );
-      VULKAN_HPP_HASH_COMBINE( seed, directDriverLoadingInfoLUNARG.pfnGetInstanceProcAddr );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DirectDriverLoadingListLUNARG>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DirectDriverLoadingListLUNARG const & directDriverLoadingListLUNARG ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, directDriverLoadingListLUNARG.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, directDriverLoadingListLUNARG.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, directDriverLoadingListLUNARG.mode );
-      VULKAN_HPP_HASH_COMBINE( seed, directDriverLoadingListLUNARG.driverCount );
-      VULKAN_HPP_HASH_COMBINE( seed, directDriverLoadingListLUNARG.pDrivers );
-      return seed;
-    }
-  };
-
 #  if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::DirectFBSurfaceCreateInfoEXT>
@@ -8722,21 +8693,6 @@
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM const & physicalDeviceMultiviewPerViewViewportsFeaturesQCOM ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMultiviewPerViewViewportsFeaturesQCOM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMultiviewPerViewViewportsFeaturesQCOM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMultiviewPerViewViewportsFeaturesQCOM.multiviewPerViewViewports );
-      return seed;
-    }
-  };
-
-  template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewProperties>
   {
     std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewProperties const & physicalDeviceMultiviewProperties ) const VULKAN_HPP_NOEXCEPT
@@ -13398,8 +13354,8 @@
       VULKAN_HPP_HASH_COMBINE( seed, videoDecodeH265PictureInfoEXT.sType );
       VULKAN_HPP_HASH_COMBINE( seed, videoDecodeH265PictureInfoEXT.pNext );
       VULKAN_HPP_HASH_COMBINE( seed, videoDecodeH265PictureInfoEXT.pStdPictureInfo );
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeH265PictureInfoEXT.sliceSegmentCount );
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeH265PictureInfoEXT.pSliceSegmentOffsets );
+      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeH265PictureInfoEXT.sliceCount );
+      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeH265PictureInfoEXT.pSliceOffsets );
       return seed;
     }
   };
diff --git a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_static_assertions.hpp b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_static_assertions.hpp
index f83b417..2f40c21 100644
--- a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_static_assertions.hpp
+++ b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_static_assertions.hpp
@@ -6070,20 +6070,6 @@
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderPassSubpassFeedbackCreateInfoEXT>::value,
                           "RenderPassSubpassFeedbackCreateInfoEXT is not nothrow_move_constructible!" );
 
-//=== VK_LUNARG_direct_driver_loading ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DirectDriverLoadingInfoLUNARG ) == sizeof( VkDirectDriverLoadingInfoLUNARG ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DirectDriverLoadingInfoLUNARG>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DirectDriverLoadingInfoLUNARG>::value,
-                          "DirectDriverLoadingInfoLUNARG is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DirectDriverLoadingListLUNARG ) == sizeof( VkDirectDriverLoadingListLUNARG ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DirectDriverLoadingListLUNARG>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DirectDriverLoadingListLUNARG>::value,
-                          "DirectDriverLoadingListLUNARG is not nothrow_move_constructible!" );
-
 //=== VK_EXT_shader_module_identifier ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderModuleIdentifierFeaturesEXT ) ==
@@ -6226,16 +6212,6 @@
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AmigoProfilingSubmitInfoSEC>::value,
                           "AmigoProfilingSubmitInfoSEC is not nothrow_move_constructible!" );
 
-//=== VK_QCOM_multiview_per_view_viewports ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM ) ==
-                            sizeof( VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM>::value,
-                          "PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM is not nothrow_move_constructible!" );
-
 //=== VK_NV_ray_tracing_invocation_reorder ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderPropertiesNV ) ==
diff --git a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_structs.hpp b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_structs.hpp
index 2ff2b5c..0163e44 100644
--- a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_structs.hpp
+++ b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_structs.hpp
@@ -12509,23 +12509,9 @@
 
     VULKAN_HPP_CONSTEXPR_14 ClearColorValue( const std::array<float, 4> & float32_ = {} ) : float32( float32_ ) {}
 
-    VULKAN_HPP_CONSTEXPR ClearColorValue( float float32_0, float float32_1, float float32_2, float float32_3 )
-      : float32( { float32_0, float32_1, float32_2, float32_3 } )
-    {
-    }
-
     VULKAN_HPP_CONSTEXPR_14 ClearColorValue( const std::array<int32_t, 4> & int32_ ) : int32( int32_ ) {}
 
-    VULKAN_HPP_CONSTEXPR ClearColorValue( int32_t int32_0, int32_t int32_1, int32_t int32_2, int32_t int32_3 ) : int32( { int32_0, int32_1, int32_2, int32_3 } )
-    {
-    }
-
     VULKAN_HPP_CONSTEXPR_14 ClearColorValue( const std::array<uint32_t, 4> & uint32_ ) : uint32( uint32_ ) {}
-
-    VULKAN_HPP_CONSTEXPR ClearColorValue( uint32_t uint32_0, uint32_t uint32_1, uint32_t uint32_2, uint32_t uint32_3 )
-      : uint32( { uint32_0, uint32_1, uint32_2, uint32_3 } )
-    {
-    }
 #endif /*VULKAN_HPP_NO_UNION_CONSTRUCTORS*/
 
 #if !defined( VULKAN_HPP_NO_UNION_SETTERS )
@@ -24294,16 +24280,25 @@
     {
       return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags ) && ( queueCreateInfoCount == rhs.queueCreateInfoCount ) &&
              ( 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,
-                         []( char const * left, char const * right ) { return ( left == right ) || ( strcmp( left, right ) == 0 ); } ) &&
-             ( pEnabledFeatures == rhs.pEnabledFeatures );
+             [this, rhs]
+      {
+        bool equal = true;
+        for ( size_t i = 0; equal && ( i < enabledLayerCount ); ++i )
+        {
+          equal = ( ( ppEnabledLayerNames[i] == rhs.ppEnabledLayerNames[i] ) || ( strcmp( ppEnabledLayerNames[i], rhs.ppEnabledLayerNames[i] ) == 0 ) );
+        }
+        return equal;
+      }() && ( enabledExtensionCount == rhs.enabledExtensionCount ) &&
+             [this, rhs]
+      {
+        bool equal = true;
+        for ( size_t i = 0; equal && ( i < enabledExtensionCount ); ++i )
+        {
+          equal = ( ( ppEnabledExtensionNames[i] == rhs.ppEnabledExtensionNames[i] ) ||
+                    ( strcmp( ppEnabledExtensionNames[i], rhs.ppEnabledExtensionNames[i] ) == 0 ) );
+        }
+        return equal;
+      }() && ( pEnabledFeatures == rhs.pEnabledFeatures );
     }
 
     bool operator!=( DeviceCreateInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
@@ -27250,247 +27245,6 @@
     using Type = DeviceQueueInfo2;
   };
 
-  struct DirectDriverLoadingInfoLUNARG
-  {
-    using NativeType = VkDirectDriverLoadingInfoLUNARG;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDirectDriverLoadingInfoLUNARG;
-
-#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DirectDriverLoadingInfoLUNARG( VULKAN_HPP_NAMESPACE::DirectDriverLoadingFlagsLUNARG flags_                  = {},
-                                                        PFN_vkGetInstanceProcAddr                            pfnGetInstanceProcAddr_ = {},
-                                                        void *                                               pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext( pNext_ )
-      , flags( flags_ )
-      , pfnGetInstanceProcAddr( pfnGetInstanceProcAddr_ )
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DirectDriverLoadingInfoLUNARG( DirectDriverLoadingInfoLUNARG const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DirectDriverLoadingInfoLUNARG( VkDirectDriverLoadingInfoLUNARG const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DirectDriverLoadingInfoLUNARG( *reinterpret_cast<DirectDriverLoadingInfoLUNARG const *>( &rhs ) )
-    {
-    }
-
-    DirectDriverLoadingInfoLUNARG & operator=( DirectDriverLoadingInfoLUNARG const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
-
-    DirectDriverLoadingInfoLUNARG & operator=( VkDirectDriverLoadingInfoLUNARG const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DirectDriverLoadingInfoLUNARG const *>( &rhs );
-      return *this;
-    }
-
-#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( VULKAN_HPP_NAMESPACE::DirectDriverLoadingFlagsLUNARG flags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      flags = flags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DirectDriverLoadingInfoLUNARG & setPfnGetInstanceProcAddr( PFN_vkGetInstanceProcAddr pfnGetInstanceProcAddr_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pfnGetInstanceProcAddr = pfnGetInstanceProcAddr_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
-
-    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 )
-#  if 14 <= VULKAN_HPP_CPP_VERSION
-    auto
-#  else
-    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
-               void * const &,
-               VULKAN_HPP_NAMESPACE::DirectDriverLoadingFlagsLUNARG const &,
-               PFN_vkGetInstanceProcAddr const &>
-#  endif
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, flags, pfnGetInstanceProcAddr );
-    }
-#endif
-
-    bool operator==( DirectDriverLoadingInfoLUNARG 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 ) && ( pfnGetInstanceProcAddr == rhs.pfnGetInstanceProcAddr );
-#endif
-    }
-
-    bool operator!=( DirectDriverLoadingInfoLUNARG const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-
-  public:
-    VULKAN_HPP_NAMESPACE::StructureType                  sType                  = StructureType::eDirectDriverLoadingInfoLUNARG;
-    void *                                               pNext                  = {};
-    VULKAN_HPP_NAMESPACE::DirectDriverLoadingFlagsLUNARG flags                  = {};
-    PFN_vkGetInstanceProcAddr                            pfnGetInstanceProcAddr = {};
-  };
-
-  template <>
-  struct CppType<StructureType, StructureType::eDirectDriverLoadingInfoLUNARG>
-  {
-    using Type = DirectDriverLoadingInfoLUNARG;
-  };
-
-  struct DirectDriverLoadingListLUNARG
-  {
-    using NativeType = VkDirectDriverLoadingListLUNARG;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDirectDriverLoadingListLUNARG;
-
-#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_    = {},
-      void *                                                      pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext( pNext_ )
-      , mode( mode_ )
-      , driverCount( driverCount_ )
-      , pDrivers( pDrivers_ )
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DirectDriverLoadingListLUNARG( DirectDriverLoadingListLUNARG const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DirectDriverLoadingListLUNARG( VkDirectDriverLoadingListLUNARG const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DirectDriverLoadingListLUNARG( *reinterpret_cast<DirectDriverLoadingListLUNARG const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DirectDriverLoadingListLUNARG( VULKAN_HPP_NAMESPACE::DirectDriverLoadingModeLUNARG                                                              mode_,
-                                   VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DirectDriverLoadingInfoLUNARG> const & drivers_,
-                                   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_STRUCT_CONSTRUCTORS*/
-
-    DirectDriverLoadingListLUNARG & operator=( VkDirectDriverLoadingListLUNARG const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DirectDriverLoadingListLUNARG const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DirectDriverLoadingListLUNARG & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DirectDriverLoadingListLUNARG & setMode( VULKAN_HPP_NAMESPACE::DirectDriverLoadingModeLUNARG mode_ ) VULKAN_HPP_NOEXCEPT
-    {
-      mode = mode_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DirectDriverLoadingListLUNARG & setDriverCount( uint32_t driverCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      driverCount = driverCount_;
-      return *this;
-    }
-
-    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(
-      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_STRUCT_SETTERS*/
-
-    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 )
-#  if 14 <= VULKAN_HPP_CPP_VERSION
-    auto
-#  else
-    std::tuple<VULKAN_HPP_NAMESPACE::StructureType 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 );
-    }
-#endif
-
-    bool operator==( DirectDriverLoadingListLUNARG 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 ) && ( driverCount == rhs.driverCount ) && ( pDrivers == rhs.pDrivers );
-#endif
-    }
-
-    bool operator!=( DirectDriverLoadingListLUNARG const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-
-  public:
-    VULKAN_HPP_NAMESPACE::StructureType                         sType       = StructureType::eDirectDriverLoadingListLUNARG;
-    void *                                                      pNext       = {};
-    VULKAN_HPP_NAMESPACE::DirectDriverLoadingModeLUNARG         mode        = VULKAN_HPP_NAMESPACE::DirectDriverLoadingModeLUNARG::eExclusive;
-    uint32_t                                                    driverCount = {};
-    const VULKAN_HPP_NAMESPACE::DirectDriverLoadingInfoLUNARG * pDrivers    = {};
-  };
-
-  template <>
-  struct CppType<StructureType, StructureType::eDirectDriverLoadingListLUNARG>
-  {
-    using Type = DirectDriverLoadingListLUNARG;
-  };
-
 #if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
   struct DirectFBSurfaceCreateInfoEXT
   {
@@ -38930,38 +38684,6 @@
       return *this;
     }
 
-#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( VULKAN_HPP_NAMESPACE::DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
-    {
-      size = size_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 SubresourceLayout & setRowPitch( VULKAN_HPP_NAMESPACE::DeviceSize rowPitch_ ) VULKAN_HPP_NOEXCEPT
-    {
-      rowPitch = rowPitch_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 SubresourceLayout & setArrayPitch( VULKAN_HPP_NAMESPACE::DeviceSize arrayPitch_ ) VULKAN_HPP_NOEXCEPT
-    {
-      arrayPitch = arrayPitch_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 SubresourceLayout & setDepthPitch( VULKAN_HPP_NAMESPACE::DeviceSize depthPitch_ ) VULKAN_HPP_NOEXCEPT
-    {
-      depthPitch = depthPitch_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
-
     operator VkSubresourceLayout const &() const VULKAN_HPP_NOEXCEPT
     {
       return *reinterpret_cast<const VkSubresourceLayout *>( this );
@@ -44312,15 +44034,25 @@
     {
       return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags ) && ( pApplicationInfo == rhs.pApplicationInfo ) &&
              ( 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,
-                         []( char const * left, char const * right ) { return ( left == right ) || ( strcmp( left, right ) == 0 ); } );
+             [this, rhs]
+      {
+        bool equal = true;
+        for ( size_t i = 0; equal && ( i < enabledLayerCount ); ++i )
+        {
+          equal = ( ( ppEnabledLayerNames[i] == rhs.ppEnabledLayerNames[i] ) || ( strcmp( ppEnabledLayerNames[i], rhs.ppEnabledLayerNames[i] ) == 0 ) );
+        }
+        return equal;
+      }() && ( enabledExtensionCount == rhs.enabledExtensionCount ) &&
+             [this, rhs]
+      {
+        bool equal = true;
+        for ( size_t i = 0; equal && ( i < enabledExtensionCount ); ++i )
+        {
+          equal = ( ( ppEnabledExtensionNames[i] == rhs.ppEnabledExtensionNames[i] ) ||
+                    ( strcmp( ppEnabledExtensionNames[i], rhs.ppEnabledExtensionNames[i] ) == 0 ) );
+        }
+        return equal;
+      }();
     }
 
     bool operator!=( InstanceCreateInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
@@ -63992,106 +63724,6 @@
     using Type = PhysicalDeviceMultiviewPerViewAttributesPropertiesNVX;
   };
 
-  struct PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM
-  {
-    using NativeType = VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM;
-
-#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_ )
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM( PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM( VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM( *reinterpret_cast<PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM &
-      operator=( PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
-
-    PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM & operator=( VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM &
-                            setMultiviewPerViewViewports( VULKAN_HPP_NAMESPACE::Bool32 multiviewPerViewViewports_ ) VULKAN_HPP_NOEXCEPT
-    {
-      multiviewPerViewViewports = multiviewPerViewViewports_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
-
-    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 )
-#  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 );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM 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 ) && ( multiviewPerViewViewports == rhs.multiviewPerViewViewports );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    VULKAN_HPP_NAMESPACE::StructureType sType                     = StructureType::ePhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM;
-    void *                              pNext                     = {};
-    VULKAN_HPP_NAMESPACE::Bool32        multiviewPerViewViewports = {};
-  };
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM>
-  {
-    using Type = PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM;
-  };
-
   struct PhysicalDeviceMultiviewProperties
   {
     using NativeType = VkPhysicalDeviceMultiviewProperties;
@@ -99236,14 +98868,14 @@
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeH265PictureInfoEXT;
 
 #  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoDecodeH265PictureInfoEXT( StdVideoDecodeH265PictureInfo * pStdPictureInfo_      = {},
-                                                        uint32_t                        sliceSegmentCount_    = {},
-                                                        const uint32_t *                pSliceSegmentOffsets_ = {},
-                                                        const void *                    pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR VideoDecodeH265PictureInfoEXT( StdVideoDecodeH265PictureInfo * pStdPictureInfo_ = {},
+                                                        uint32_t                        sliceCount_      = {},
+                                                        const uint32_t *                pSliceOffsets_   = {},
+                                                        const void *                    pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
       : pNext( pNext_ )
       , pStdPictureInfo( pStdPictureInfo_ )
-      , sliceSegmentCount( sliceSegmentCount_ )
-      , pSliceSegmentOffsets( pSliceSegmentOffsets_ )
+      , sliceCount( sliceCount_ )
+      , pSliceOffsets( pSliceOffsets_ )
     {
     }
 
@@ -99256,12 +98888,9 @@
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     VideoDecodeH265PictureInfoEXT( StdVideoDecodeH265PictureInfo *                                       pStdPictureInfo_,
-                                   VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & sliceSegmentOffsets_,
+                                   VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & sliceOffsets_,
                                    const void *                                                          pNext_ = nullptr )
-      : pNext( pNext_ )
-      , pStdPictureInfo( pStdPictureInfo_ )
-      , sliceSegmentCount( static_cast<uint32_t>( sliceSegmentOffsets_.size() ) )
-      , pSliceSegmentOffsets( sliceSegmentOffsets_.data() )
+      : pNext( pNext_ ), pStdPictureInfo( pStdPictureInfo_ ), sliceCount( static_cast<uint32_t>( sliceOffsets_.size() ) ), pSliceOffsets( sliceOffsets_.data() )
     {
     }
 #    endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
@@ -99288,24 +98917,23 @@
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeH265PictureInfoEXT & setSliceSegmentCount( uint32_t sliceSegmentCount_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoDecodeH265PictureInfoEXT & setSliceCount( uint32_t sliceCount_ ) VULKAN_HPP_NOEXCEPT
     {
-      sliceSegmentCount = sliceSegmentCount_;
+      sliceCount = sliceCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeH265PictureInfoEXT & setPSliceSegmentOffsets( const uint32_t * pSliceSegmentOffsets_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoDecodeH265PictureInfoEXT & setPSliceOffsets( const uint32_t * pSliceOffsets_ ) VULKAN_HPP_NOEXCEPT
     {
-      pSliceSegmentOffsets = pSliceSegmentOffsets_;
+      pSliceOffsets = pSliceOffsets_;
       return *this;
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoDecodeH265PictureInfoEXT &
-      setSliceSegmentOffsets( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & sliceSegmentOffsets_ ) VULKAN_HPP_NOEXCEPT
+    VideoDecodeH265PictureInfoEXT & setSliceOffsets( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & sliceOffsets_ ) VULKAN_HPP_NOEXCEPT
     {
-      sliceSegmentCount    = static_cast<uint32_t>( sliceSegmentOffsets_.size() );
-      pSliceSegmentOffsets = sliceSegmentOffsets_.data();
+      sliceCount    = static_cast<uint32_t>( sliceOffsets_.size() );
+      pSliceOffsets = sliceOffsets_.data();
       return *this;
     }
 #    endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
@@ -99333,7 +98961,7 @@
 #    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
-      return std::tie( sType, pNext, pStdPictureInfo, sliceSegmentCount, pSliceSegmentOffsets );
+      return std::tie( sType, pNext, pStdPictureInfo, sliceCount, pSliceOffsets );
     }
 #  endif
 
@@ -99345,8 +98973,8 @@
 #    if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
 #    else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( pStdPictureInfo == rhs.pStdPictureInfo ) && ( sliceSegmentCount == rhs.sliceSegmentCount ) &&
-             ( pSliceSegmentOffsets == rhs.pSliceSegmentOffsets );
+      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( pStdPictureInfo == rhs.pStdPictureInfo ) && ( sliceCount == rhs.sliceCount ) &&
+             ( pSliceOffsets == rhs.pSliceOffsets );
 #    endif
     }
 
@@ -99357,11 +98985,11 @@
 #  endif
 
   public:
-    VULKAN_HPP_NAMESPACE::StructureType sType                = StructureType::eVideoDecodeH265PictureInfoEXT;
-    const void *                        pNext                = {};
-    StdVideoDecodeH265PictureInfo *     pStdPictureInfo      = {};
-    uint32_t                            sliceSegmentCount    = {};
-    const uint32_t *                    pSliceSegmentOffsets = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType           = StructureType::eVideoDecodeH265PictureInfoEXT;
+    const void *                        pNext           = {};
+    StdVideoDecodeH265PictureInfo *     pStdPictureInfo = {};
+    uint32_t                            sliceCount      = {};
+    const uint32_t *                    pSliceOffsets   = {};
   };
 
   template <>
diff --git a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_to_string.hpp b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_to_string.hpp
index 103e766..d467b66 100644
--- a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_to_string.hpp
+++ b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_to_string.hpp
@@ -3125,13 +3125,6 @@
     return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
-  //=== VK_LUNARG_direct_driver_loading ===
-
-  VULKAN_HPP_INLINE std::string to_string( DirectDriverLoadingFlagsLUNARG )
-  {
-    return "{}";
-  }
-
   //=== VK_NV_optical_flow ===
 
   VULKAN_HPP_INLINE std::string to_string( OpticalFlowUsageFlagsNV value )
@@ -4047,8 +4040,6 @@
       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";
@@ -4067,7 +4058,6 @@
       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::ePhysicalDeviceMutableDescriptorTypeFeaturesEXT: return "PhysicalDeviceMutableDescriptorTypeFeaturesEXT";
@@ -8163,23 +8153,6 @@
     }
   }
 
-  //=== VK_LUNARG_direct_driver_loading ===
-
-  VULKAN_HPP_INLINE std::string to_string( DirectDriverLoadingModeLUNARG value )
-  {
-    switch ( value )
-    {
-      case DirectDriverLoadingModeLUNARG::eExclusive: return "Exclusive";
-      case DirectDriverLoadingModeLUNARG::eInclusive: return "Inclusive";
-      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( DirectDriverLoadingFlagBitsLUNARG )
-  {
-    return "(void)";
-  }
-
   //=== VK_EXT_rasterization_order_attachment_access ===
 
   VULKAN_HPP_INLINE std::string to_string( PipelineColorBlendStateCreateFlagBits value )
diff --git a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_win32.h b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_win32.h
index a8e46c8..affe0c0 100644
--- a/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_win32.h
+++ b/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_win32.h
@@ -308,24 +308,6 @@
     VkDeviceGroupPresentModeFlagsKHR*           pModes);
 #endif
 
-
-#define VK_NV_acquire_winrt_display 1
-#define VK_NV_ACQUIRE_WINRT_DISPLAY_SPEC_VERSION 1
-#define VK_NV_ACQUIRE_WINRT_DISPLAY_EXTENSION_NAME "VK_NV_acquire_winrt_display"
-typedef VkResult (VKAPI_PTR *PFN_vkAcquireWinrtDisplayNV)(VkPhysicalDevice physicalDevice, VkDisplayKHR display);
-typedef VkResult (VKAPI_PTR *PFN_vkGetWinrtDisplayNV)(VkPhysicalDevice physicalDevice, uint32_t deviceRelativeId, VkDisplayKHR* pDisplay);
-
-#ifndef VK_NO_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkAcquireWinrtDisplayNV(
-    VkPhysicalDevice                            physicalDevice,
-    VkDisplayKHR                                display);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkGetWinrtDisplayNV(
-    VkPhysicalDevice                            physicalDevice,
-    uint32_t                                    deviceRelativeId,
-    VkDisplayKHR*                               pDisplay);
-#endif
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/third_party/vulkan-deps/vulkan-headers/src/registry/genvk.py b/third_party/vulkan-deps/vulkan-headers/src/registry/genvk.py
index 5198bd9..4cd362f 100755
--- a/third_party/vulkan-deps/vulkan-headers/src/registry/genvk.py
+++ b/third_party/vulkan-deps/vulkan-headers/src/registry/genvk.py
@@ -384,7 +384,7 @@
         [ 'vulkan_macos.h',       [ 'VK_MVK_macos_surface'        ], commonSuppressExtensions ],
         [ 'vulkan_vi.h',          [ 'VK_NN_vi_surface'            ], commonSuppressExtensions ],
         [ 'vulkan_wayland.h',     [ 'VK_KHR_wayland_surface'      ], commonSuppressExtensions ],
-        [ 'vulkan_win32.h',       [ 'VK_.*_win32(|_.*)', 'VK_.*_winrt(|_.*)', 'VK_EXT_full_screen_exclusive' ],
+        [ 'vulkan_win32.h',       [ 'VK_.*_win32(|_.*)', 'VK_EXT_full_screen_exclusive' ],
                                                                      commonSuppressExtensions +
                                                                      [ 'VK_KHR_external_semaphore',
                                                                        'VK_KHR_external_memory_capabilities',
diff --git a/third_party/vulkan-deps/vulkan-headers/src/registry/profiles/VP_KHR_roadmap_2022.json b/third_party/vulkan-deps/vulkan-headers/src/registry/profiles/VP_KHR_roadmap_2022.json
index b528eca..0fe7926 100644
--- a/third_party/vulkan-deps/vulkan-headers/src/registry/profiles/VP_KHR_roadmap_2022.json
+++ b/third_party/vulkan-deps/vulkan-headers/src/registry/profiles/VP_KHR_roadmap_2022.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://schema.khronos.org/vulkan/profiles-0.8.1-204.json#",
+    "$schema": "https://schema.khronos.org/vulkan/profiles-0.8.0-204.json#",
     "capabilities": {
         "vulkan10requirements": {
             "features": {
@@ -54,28 +54,14 @@
                         "subTexelPrecisionBits": 8,
                         "mipmapPrecisionBits": 6,
                         "maxSamplerLodBias": 14,
+                        "pointSizeGranularity": 0.125,
+                        "lineWidthGranularity": 0.5,
                         "standardSampleLocations": true,
                         "maxColorAttachments": 7
                     }
                 }
             }
         },
-        "vulkan10optionals_roadmap2022": {
-            "features": {
-                "VkPhysicalDeviceFeatures": {
-                    "largePoints": true,
-                    "wideLines": true
-                }
-            },
-            "properties": {
-                "VkPhysicalDeviceProperties": {
-                    "limits": {
-                        "pointSizeGranularity": 0.125,
-                        "lineWidthGranularity": 0.5
-                    }
-                }
-            }
-        },
         "vulkan11requirements": {
             "features": {
                 "VkPhysicalDeviceVulkan11Features": {
@@ -321,16 +307,10 @@
             },
             "history": [
                 {
-                    "revision": 7,
-                    "date": "2022-11-16",
-                    "author": "Christophe Riccio",
-                    "comment": "Fix wideLines and largePoints that are optionals"
-                },
-                {
                     "revision": 6,
                     "date": "2022-11-02",
                     "author": "Christophe Riccio",
-                    "comment": "Fix roadmap 2022 maxInlineUniformTotalSize limit, 256 instead of 4"
+                    "comment": "fix roadmap 2022 maxInlineUniformTotalSize limit, 256 instead of 4"
                 },
                 {
                     "revision": 5,
@@ -372,9 +352,6 @@
                 "vulkan12requirements_roadmap2022",
                 "vulkan13requirements",
                 "vulkan13requirements_roadmap2022"
-            ],
-            "optionals": [
-                "vulkan10optionals_roadmap2022"
             ]
         }
     }
diff --git a/third_party/vulkan-deps/vulkan-headers/src/registry/validusage.json b/third_party/vulkan-deps/vulkan-headers/src/registry/validusage.json
index 32d8c7c..6adf1ff 100644
--- a/third_party/vulkan-deps/vulkan-headers/src/registry/validusage.json
+++ b/third_party/vulkan-deps/vulkan-headers/src/registry/validusage.json
@@ -1,9 +1,9 @@
 {
   "version info": {
     "schema version": 2,
-    "api version": "1.3.236",
-    "comment": "from git branch: github-main commit: db2b908b59b7774da9aa8b07baed4f5d018ae4d9",
-    "date": "2022-12-01 11:53:20Z"
+    "api version": "1.3.235",
+    "comment": "from git branch: github-main commit: f4eb3e9a7acdef9ab62ac9af954a50409895ac6d",
+    "date": "2022-11-17 12:17:37Z"
   },
   "validation": {
     "vkGetInstanceProcAddr": {
@@ -59,36 +59,30 @@
       ]
     },
     "VkInstanceCreateInfo": {
-      "(VK_EXT_debug_report,VK_EXT_debug_utils,VK_KHR_portability_enumeration,VK_LUNARG_direct_driver_loading)+(VK_EXT_debug_report)": [
+      "(VK_EXT_debug_report,VK_EXT_debug_utils,VK_KHR_portability_enumeration)+(VK_EXT_debug_report)": [
         {
           "vuid": "VUID-VkInstanceCreateInfo-pNext-04925",
           "text": " If the <code>pNext</code> chain of <code>VkInstanceCreateInfo</code> includes a <code>VkDebugReportCallbackCreateInfoEXT</code> structure, the list of enabled extensions in <code>ppEnabledExtensionNames</code> <strong class=\"purple\">must</strong> contain <code><a href=\"#VK_EXT_debug_report\">VK_EXT_debug_report</a></code>"
         }
       ],
-      "(VK_EXT_debug_report,VK_EXT_debug_utils,VK_KHR_portability_enumeration,VK_LUNARG_direct_driver_loading)+(VK_EXT_debug_utils)": [
+      "(VK_EXT_debug_report,VK_EXT_debug_utils,VK_KHR_portability_enumeration)+(VK_EXT_debug_utils)": [
         {
           "vuid": "VUID-VkInstanceCreateInfo-pNext-04926",
           "text": " If the <code>pNext</code> chain of <code>VkInstanceCreateInfo</code> includes a <code>VkDebugUtilsMessengerCreateInfoEXT</code> structure, the list of enabled extensions in <code>ppEnabledExtensionNames</code> <strong class=\"purple\">must</strong> contain <code><a href=\"#VK_EXT_debug_utils\">VK_EXT_debug_utils</a></code>"
         }
       ],
-      "(VK_EXT_debug_report,VK_EXT_debug_utils,VK_KHR_portability_enumeration,VK_LUNARG_direct_driver_loading)+(VK_EXT_metal_objects)": [
+      "(VK_EXT_debug_report,VK_EXT_debug_utils,VK_KHR_portability_enumeration)+(VK_EXT_metal_objects)": [
         {
           "vuid": "VUID-VkInstanceCreateInfo-pNext-06779",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure, its <code>exportObjectType</code> member <strong class=\"purple\">must</strong> be either <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_DEVICE_BIT_EXT</code> or <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_COMMAND_QUEUE_BIT_EXT</code>"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure, its <code>exportObjectType</code> member <strong class=\"purple\">must</strong> be either <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_DEVICE_BIT_EXT</code> or <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_COMMAND_QUEUE_BIT_EXT</code>."
         }
       ],
-      "(VK_EXT_debug_report,VK_EXT_debug_utils,VK_KHR_portability_enumeration,VK_LUNARG_direct_driver_loading)+(VK_KHR_portability_enumeration)": [
+      "(VK_EXT_debug_report,VK_EXT_debug_utils,VK_KHR_portability_enumeration)+(VK_KHR_portability_enumeration)": [
         {
           "vuid": "VUID-VkInstanceCreateInfo-flags-06559",
           "text": " If <code>flags</code> has the <code>VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR</code> bit set, the list of enabled extensions in <code>ppEnabledExtensionNames</code> <strong class=\"purple\">must</strong> contain <code><a href=\"#VK_KHR_portability_enumeration\">VK_KHR_portability_enumeration</a></code>"
         }
       ],
-      "(VK_EXT_debug_report,VK_EXT_debug_utils,VK_KHR_portability_enumeration,VK_LUNARG_direct_driver_loading)+(VK_LUNARG_direct_driver_loading)": [
-        {
-          "vuid": "VUID-VkInstanceCreateInfo-pNext",
-          "text": " If the <code>pNext</code> chain of <code>VkInstanceCreateInfo</code> includes a <a href=\"#VkDirectDriverLoadingListLUNARG\">VkDirectDriverLoadingListLUNARG</a> structure, the list of enabled extensions in <code>ppEnabledExtensionNames</code> <strong class=\"purple\">must</strong> contain <a href=\"#VK_LUNARG_direct_driver_loading\">VK_LUNARG_direct_driver_loading</a>"
-        }
-      ],
       "core": [
         {
           "vuid": "VUID-VkInstanceCreateInfo-sType-sType",
@@ -96,7 +90,7 @@
         },
         {
           "vuid": "VUID-VkInstanceCreateInfo-pNext-pNext",
-          "text": " Each <code>pNext</code> member of any structure (including this one) in the <code>pNext</code> chain <strong class=\"purple\">must</strong> be either <code>NULL</code> or a pointer to a valid instance of <a href=\"#VkDebugReportCallbackCreateInfoEXT\">VkDebugReportCallbackCreateInfoEXT</a>, <a href=\"#VkDebugUtilsMessengerCreateInfoEXT\">VkDebugUtilsMessengerCreateInfoEXT</a>, <a href=\"#VkDirectDriverLoadingListLUNARG\">VkDirectDriverLoadingListLUNARG</a>, <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a>, <a href=\"#VkValidationFeaturesEXT\">VkValidationFeaturesEXT</a>, or <a href=\"#VkValidationFlagsEXT\">VkValidationFlagsEXT</a>"
+          "text": " Each <code>pNext</code> member of any structure (including this one) in the <code>pNext</code> chain <strong class=\"purple\">must</strong> be either <code>NULL</code> or a pointer to a valid instance of <a href=\"#VkDebugReportCallbackCreateInfoEXT\">VkDebugReportCallbackCreateInfoEXT</a>, <a href=\"#VkDebugUtilsMessengerCreateInfoEXT\">VkDebugUtilsMessengerCreateInfoEXT</a>, <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a>, <a href=\"#VkValidationFeaturesEXT\">VkValidationFeaturesEXT</a>, or <a href=\"#VkValidationFlagsEXT\">VkValidationFlagsEXT</a>"
         },
         {
           "vuid": "VUID-VkInstanceCreateInfo-sType-unique",
@@ -160,38 +154,6 @@
         }
       ]
     },
-    "VkDirectDriverLoadingListLUNARG": {
-      "(VK_LUNARG_direct_driver_loading)": [
-        {
-          "vuid": "VUID-VkDirectDriverLoadingListLUNARG-sType-sType",
-          "text": " <code>sType</code> <strong class=\"purple\">must</strong> be <code>VK_STRUCTURE_TYPE_DIRECT_DRIVER_LOADING_LIST_LUNARG</code>"
-        },
-        {
-          "vuid": "VUID-VkDirectDriverLoadingListLUNARG-mode-parameter",
-          "text": " <code>mode</code> <strong class=\"purple\">must</strong> be a valid <a href=\"#VkDirectDriverLoadingModeLUNARG\">VkDirectDriverLoadingModeLUNARG</a> value"
-        },
-        {
-          "vuid": "VUID-VkDirectDriverLoadingListLUNARG-pDrivers-parameter",
-          "text": " <code>pDrivers</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>driverCount</code> valid <a href=\"#VkDirectDriverLoadingInfoLUNARG\">VkDirectDriverLoadingInfoLUNARG</a> structures"
-        },
-        {
-          "vuid": "VUID-VkDirectDriverLoadingListLUNARG-driverCount-arraylength",
-          "text": " <code>driverCount</code> <strong class=\"purple\">must</strong> be greater than <code>0</code>"
-        }
-      ]
-    },
-    "VkDirectDriverLoadingInfoLUNARG": {
-      "(VK_LUNARG_direct_driver_loading)": [
-        {
-          "vuid": "VUID-VkDirectDriverLoadingInfoLUNARG-sType-sType",
-          "text": " <code>sType</code> <strong class=\"purple\">must</strong> be <code>VK_STRUCTURE_TYPE_DIRECT_DRIVER_LOADING_INFO_LUNARG</code>"
-        },
-        {
-          "vuid": "VUID-VkDirectDriverLoadingInfoLUNARG-flags-zerobitmask",
-          "text": " <code>flags</code> <strong class=\"purple\">must</strong> be <code>0</code>"
-        }
-      ]
-    },
     "VkApplicationInfo": {
       "core": [
         {
@@ -704,7 +666,7 @@
       "(VK_EXT_descriptor_buffer)+(VK_AMD_shader_fragment_mask)": [
         {
           "vuid": "VUID-VkDeviceCreateInfo-None-08095",
-          "text": " If <a href=\"#features-descriptorBuffer\"><code>descriptorBuffer</code></a> is enabled, <code>ppEnabledExtensionNames</code> <strong class=\"purple\">must</strong> not contain <code><a href=\"#VK_AMD_shader_fragment_mask\">VK_AMD_shader_fragment_mask</a></code>"
+          "text": " If <a href=\"#features-descriptorBuffer\">descriptorBuffer</a> is enabled, <code>ppEnabledExtensionNames</code> <strong class=\"purple\">must</strong> not contain <code><a href=\"#VK_AMD_shader_fragment_mask\">VK_AMD_shader_fragment_mask</a></code>"
         }
       ],
       "core": [
@@ -714,7 +676,7 @@
         },
         {
           "vuid": "VUID-VkDeviceCreateInfo-pNext-pNext",
-          "text": " Each <code>pNext</code> member of any structure (including this one) in the <code>pNext</code> chain <strong class=\"purple\">must</strong> be either <code>NULL</code> or a pointer to a valid instance of <a href=\"#VkDeviceDeviceMemoryReportCreateInfoEXT\">VkDeviceDeviceMemoryReportCreateInfoEXT</a>, <a href=\"#VkDeviceDiagnosticsConfigCreateInfoNV\">VkDeviceDiagnosticsConfigCreateInfoNV</a>, <a href=\"#VkDeviceGroupDeviceCreateInfo\">VkDeviceGroupDeviceCreateInfo</a>, <a href=\"#VkDeviceMemoryOverallocationCreateInfoAMD\">VkDeviceMemoryOverallocationCreateInfoAMD</a>, <a href=\"#VkDevicePrivateDataCreateInfo\">VkDevicePrivateDataCreateInfo</a>, <a href=\"#VkPhysicalDevice16BitStorageFeatures\">VkPhysicalDevice16BitStorageFeatures</a>, <a href=\"#VkPhysicalDevice4444FormatsFeaturesEXT\">VkPhysicalDevice4444FormatsFeaturesEXT</a>, <a href=\"#VkPhysicalDevice8BitStorageFeatures\">VkPhysicalDevice8BitStorageFeatures</a>, <a href=\"#VkPhysicalDeviceASTCDecodeFeaturesEXT\">VkPhysicalDeviceASTCDecodeFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceAccelerationStructureFeaturesKHR\">VkPhysicalDeviceAccelerationStructureFeaturesKHR</a>, <a href=\"#VkPhysicalDeviceAddressBindingReportFeaturesEXT\">VkPhysicalDeviceAddressBindingReportFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceAmigoProfilingFeaturesSEC\">VkPhysicalDeviceAmigoProfilingFeaturesSEC</a>, <a href=\"#VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT\">VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT\">VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceBorderColorSwizzleFeaturesEXT\">VkPhysicalDeviceBorderColorSwizzleFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceBufferDeviceAddressFeatures\">VkPhysicalDeviceBufferDeviceAddressFeatures</a>, <a href=\"#VkPhysicalDeviceBufferDeviceAddressFeaturesEXT\">VkPhysicalDeviceBufferDeviceAddressFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceCoherentMemoryFeaturesAMD\">VkPhysicalDeviceCoherentMemoryFeaturesAMD</a>, <a href=\"#VkPhysicalDeviceColorWriteEnableFeaturesEXT\">VkPhysicalDeviceColorWriteEnableFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceComputeShaderDerivativesFeaturesNV\">VkPhysicalDeviceComputeShaderDerivativesFeaturesNV</a>, <a href=\"#VkPhysicalDeviceConditionalRenderingFeaturesEXT\">VkPhysicalDeviceConditionalRenderingFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceCooperativeMatrixFeaturesNV\">VkPhysicalDeviceCooperativeMatrixFeaturesNV</a>, <a href=\"#VkPhysicalDeviceCopyMemoryIndirectFeaturesNV\">VkPhysicalDeviceCopyMemoryIndirectFeaturesNV</a>, <a href=\"#VkPhysicalDeviceCornerSampledImageFeaturesNV\">VkPhysicalDeviceCornerSampledImageFeaturesNV</a>, <a href=\"#VkPhysicalDeviceCoverageReductionModeFeaturesNV\">VkPhysicalDeviceCoverageReductionModeFeaturesNV</a>, <a href=\"#VkPhysicalDeviceCustomBorderColorFeaturesEXT\">VkPhysicalDeviceCustomBorderColorFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV\">VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV</a>, <a href=\"#VkPhysicalDeviceDepthClampZeroOneFeaturesEXT\">VkPhysicalDeviceDepthClampZeroOneFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceDepthClipControlFeaturesEXT\">VkPhysicalDeviceDepthClipControlFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceDepthClipEnableFeaturesEXT\">VkPhysicalDeviceDepthClipEnableFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceDescriptorBufferFeaturesEXT\">VkPhysicalDeviceDescriptorBufferFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceDescriptorIndexingFeatures\">VkPhysicalDeviceDescriptorIndexingFeatures</a>, <a href=\"#VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE\">VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE</a>, <a href=\"#VkPhysicalDeviceDeviceGeneratedCommandsFeaturesNV\">VkPhysicalDeviceDeviceGeneratedCommandsFeaturesNV</a>, <a href=\"#VkPhysicalDeviceDeviceMemoryReportFeaturesEXT\">VkPhysicalDeviceDeviceMemoryReportFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceDiagnosticsConfigFeaturesNV\">VkPhysicalDeviceDiagnosticsConfigFeaturesNV</a>, <a href=\"#VkPhysicalDeviceDynamicRenderingFeatures\">VkPhysicalDeviceDynamicRenderingFeatures</a>, <a href=\"#VkPhysicalDeviceExclusiveScissorFeaturesNV\">VkPhysicalDeviceExclusiveScissorFeaturesNV</a>, <a href=\"#VkPhysicalDeviceExtendedDynamicState2FeaturesEXT\">VkPhysicalDeviceExtendedDynamicState2FeaturesEXT</a>, <a href=\"#VkPhysicalDeviceExtendedDynamicState3FeaturesEXT\">VkPhysicalDeviceExtendedDynamicState3FeaturesEXT</a>, <a href=\"#VkPhysicalDeviceExtendedDynamicStateFeaturesEXT\">VkPhysicalDeviceExtendedDynamicStateFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceExternalMemoryRDMAFeaturesNV\">VkPhysicalDeviceExternalMemoryRDMAFeaturesNV</a>, <a href=\"#VkPhysicalDeviceFaultFeaturesEXT\">VkPhysicalDeviceFaultFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceFeatures2\">VkPhysicalDeviceFeatures2</a>, <a href=\"#VkPhysicalDeviceFragmentDensityMap2FeaturesEXT\">VkPhysicalDeviceFragmentDensityMap2FeaturesEXT</a>, <a href=\"#VkPhysicalDeviceFragmentDensityMapFeaturesEXT\">VkPhysicalDeviceFragmentDensityMapFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM\">VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM</a>, <a href=\"#VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR\">VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR</a>, <a href=\"#VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT\">VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceFragmentShadingRateEnumsFeaturesNV\">VkPhysicalDeviceFragmentShadingRateEnumsFeaturesNV</a>, <a href=\"#VkPhysicalDeviceFragmentShadingRateFeaturesKHR\">VkPhysicalDeviceFragmentShadingRateFeaturesKHR</a>, <a href=\"#VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR\">VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR</a>, <a href=\"#VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT\">VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceHostQueryResetFeatures\">VkPhysicalDeviceHostQueryResetFeatures</a>, <a href=\"#VkPhysicalDeviceImage2DViewOf3DFeaturesEXT\">VkPhysicalDeviceImage2DViewOf3DFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceImageCompressionControlFeaturesEXT\">VkPhysicalDeviceImageCompressionControlFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceImageCompressionControlSwapchainFeaturesEXT\">VkPhysicalDeviceImageCompressionControlSwapchainFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceImageProcessingFeaturesQCOM\">VkPhysicalDeviceImageProcessingFeaturesQCOM</a>, <a href=\"#VkPhysicalDeviceImageRobustnessFeatures\">VkPhysicalDeviceImageRobustnessFeatures</a>, <a href=\"#VkPhysicalDeviceImageViewMinLodFeaturesEXT\">VkPhysicalDeviceImageViewMinLodFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceImagelessFramebufferFeatures\">VkPhysicalDeviceImagelessFramebufferFeatures</a>, <a href=\"#VkPhysicalDeviceIndexTypeUint8FeaturesEXT\">VkPhysicalDeviceIndexTypeUint8FeaturesEXT</a>, <a href=\"#VkPhysicalDeviceInheritedViewportScissorFeaturesNV\">VkPhysicalDeviceInheritedViewportScissorFeaturesNV</a>, <a href=\"#VkPhysicalDeviceInlineUniformBlockFeatures\">VkPhysicalDeviceInlineUniformBlockFeatures</a>, <a href=\"#VkPhysicalDeviceInvocationMaskFeaturesHUAWEI\">VkPhysicalDeviceInvocationMaskFeaturesHUAWEI</a>, <a href=\"#VkPhysicalDeviceLegacyDitheringFeaturesEXT\">VkPhysicalDeviceLegacyDitheringFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceLineRasterizationFeaturesEXT\">VkPhysicalDeviceLineRasterizationFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceLinearColorAttachmentFeaturesNV\">VkPhysicalDeviceLinearColorAttachmentFeaturesNV</a>, <a href=\"#VkPhysicalDeviceMaintenance4Features\">VkPhysicalDeviceMaintenance4Features</a>, <a href=\"#VkPhysicalDeviceMemoryDecompressionFeaturesNV\">VkPhysicalDeviceMemoryDecompressionFeaturesNV</a>, <a href=\"#VkPhysicalDeviceMemoryPriorityFeaturesEXT\">VkPhysicalDeviceMemoryPriorityFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceMeshShaderFeaturesEXT\">VkPhysicalDeviceMeshShaderFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceMeshShaderFeaturesNV\">VkPhysicalDeviceMeshShaderFeaturesNV</a>, <a href=\"#VkPhysicalDeviceMultiDrawFeaturesEXT\">VkPhysicalDeviceMultiDrawFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT\">VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceMultiviewFeatures\">VkPhysicalDeviceMultiviewFeatures</a>, <a href=\"#VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM\">VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM</a>, <a href=\"#VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT\">VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT\">VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceOpacityMicromapFeaturesEXT\">VkPhysicalDeviceOpacityMicromapFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceOpticalFlowFeaturesNV\">VkPhysicalDeviceOpticalFlowFeaturesNV</a>, <a href=\"#VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT\">VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT</a>, <a href=\"#VkPhysicalDevicePerformanceQueryFeaturesKHR\">VkPhysicalDevicePerformanceQueryFeaturesKHR</a>, <a href=\"#VkPhysicalDevicePipelineCreationCacheControlFeatures\">VkPhysicalDevicePipelineCreationCacheControlFeatures</a>, <a href=\"#VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR\">VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR</a>, <a href=\"#VkPhysicalDevicePipelinePropertiesFeaturesEXT\">VkPhysicalDevicePipelinePropertiesFeaturesEXT</a>, <a href=\"#VkPhysicalDevicePipelineProtectedAccessFeaturesEXT\">VkPhysicalDevicePipelineProtectedAccessFeaturesEXT</a>, <a href=\"#VkPhysicalDevicePipelineRobustnessFeaturesEXT\">VkPhysicalDevicePipelineRobustnessFeaturesEXT</a>, <a href=\"#VkPhysicalDevicePortabilitySubsetFeaturesKHR\">VkPhysicalDevicePortabilitySubsetFeaturesKHR</a>, <a href=\"#VkPhysicalDevicePresentBarrierFeaturesNV\">VkPhysicalDevicePresentBarrierFeaturesNV</a>, <a href=\"#VkPhysicalDevicePresentIdFeaturesKHR\">VkPhysicalDevicePresentIdFeaturesKHR</a>, <a href=\"#VkPhysicalDevicePresentWaitFeaturesKHR\">VkPhysicalDevicePresentWaitFeaturesKHR</a>, <a href=\"#VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT\">VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT</a>, <a href=\"#VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT\">VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT</a>, <a href=\"#VkPhysicalDevicePrivateDataFeatures\">VkPhysicalDevicePrivateDataFeatures</a>, <a href=\"#VkPhysicalDeviceProtectedMemoryFeatures\">VkPhysicalDeviceProtectedMemoryFeatures</a>, <a href=\"#VkPhysicalDeviceProvokingVertexFeaturesEXT\">VkPhysicalDeviceProvokingVertexFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT\">VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT\">VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceRayQueryFeaturesKHR\">VkPhysicalDeviceRayQueryFeaturesKHR</a>, <a href=\"#VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV\">VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV</a>, <a href=\"#VkPhysicalDeviceRayTracingMaintenance1FeaturesKHR\">VkPhysicalDeviceRayTracingMaintenance1FeaturesKHR</a>, <a href=\"#VkPhysicalDeviceRayTracingMotionBlurFeaturesNV\">VkPhysicalDeviceRayTracingMotionBlurFeaturesNV</a>, <a href=\"#VkPhysicalDeviceRayTracingPipelineFeaturesKHR\">VkPhysicalDeviceRayTracingPipelineFeaturesKHR</a>, <a href=\"#VkPhysicalDeviceRepresentativeFragmentTestFeaturesNV\">VkPhysicalDeviceRepresentativeFragmentTestFeaturesNV</a>, <a href=\"#VkPhysicalDeviceRobustness2FeaturesEXT\">VkPhysicalDeviceRobustness2FeaturesEXT</a>, <a href=\"#VkPhysicalDeviceSamplerYcbcrConversionFeatures\">VkPhysicalDeviceSamplerYcbcrConversionFeatures</a>, <a href=\"#VkPhysicalDeviceScalarBlockLayoutFeatures\">VkPhysicalDeviceScalarBlockLayoutFeatures</a>, <a href=\"#VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures\">VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures</a>, <a href=\"#VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT\">VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT</a>, <a href=\"#VkPhysicalDeviceShaderAtomicFloatFeaturesEXT\">VkPhysicalDeviceShaderAtomicFloatFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceShaderAtomicInt64Features\">VkPhysicalDeviceShaderAtomicInt64Features</a>, <a href=\"#VkPhysicalDeviceShaderClockFeaturesKHR\">VkPhysicalDeviceShaderClockFeaturesKHR</a>, <a href=\"#VkPhysicalDeviceShaderCoreBuiltinsFeaturesARM\">VkPhysicalDeviceShaderCoreBuiltinsFeaturesARM</a>, <a href=\"#VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures\">VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures</a>, <a href=\"#VkPhysicalDeviceShaderDrawParametersFeatures\">VkPhysicalDeviceShaderDrawParametersFeatures</a>, <a href=\"#VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD\">VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD</a>, <a href=\"#VkPhysicalDeviceShaderFloat16Int8Features\">VkPhysicalDeviceShaderFloat16Int8Features</a>, <a href=\"#VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT\">VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT</a>, <a href=\"#VkPhysicalDeviceShaderImageFootprintFeaturesNV\">VkPhysicalDeviceShaderImageFootprintFeaturesNV</a>, <a href=\"#VkPhysicalDeviceShaderIntegerDotProductFeatures\">VkPhysicalDeviceShaderIntegerDotProductFeatures</a>, <a href=\"#VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL\">VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL</a>, <a href=\"#VkPhysicalDeviceShaderModuleIdentifierFeaturesEXT\">VkPhysicalDeviceShaderModuleIdentifierFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceShaderSMBuiltinsFeaturesNV\">VkPhysicalDeviceShaderSMBuiltinsFeaturesNV</a>, <a href=\"#VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures\">VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures</a>, <a href=\"#VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR\">VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR</a>, <a href=\"#VkPhysicalDeviceShaderTerminateInvocationFeatures\">VkPhysicalDeviceShaderTerminateInvocationFeatures</a>, <a href=\"#VkPhysicalDeviceShadingRateImageFeaturesNV\">VkPhysicalDeviceShadingRateImageFeaturesNV</a>, <a href=\"#VkPhysicalDeviceSubgroupSizeControlFeatures\">VkPhysicalDeviceSubgroupSizeControlFeatures</a>, <a href=\"#VkPhysicalDeviceSubpassMergeFeedbackFeaturesEXT\">VkPhysicalDeviceSubpassMergeFeedbackFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceSubpassShadingFeaturesHUAWEI\">VkPhysicalDeviceSubpassShadingFeaturesHUAWEI</a>, <a href=\"#VkPhysicalDeviceSynchronization2Features\">VkPhysicalDeviceSynchronization2Features</a>, <a href=\"#VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT\">VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceTextureCompressionASTCHDRFeatures\">VkPhysicalDeviceTextureCompressionASTCHDRFeatures</a>, <a href=\"#VkPhysicalDeviceTilePropertiesFeaturesQCOM\">VkPhysicalDeviceTilePropertiesFeaturesQCOM</a>, <a href=\"#VkPhysicalDeviceTimelineSemaphoreFeatures\">VkPhysicalDeviceTimelineSemaphoreFeatures</a>, <a href=\"#VkPhysicalDeviceTransformFeedbackFeaturesEXT\">VkPhysicalDeviceTransformFeedbackFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceUniformBufferStandardLayoutFeatures\">VkPhysicalDeviceUniformBufferStandardLayoutFeatures</a>, <a href=\"#VkPhysicalDeviceVariablePointersFeatures\">VkPhysicalDeviceVariablePointersFeatures</a>, <a href=\"#VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT\">VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceVertexInputDynamicStateFeaturesEXT\">VkPhysicalDeviceVertexInputDynamicStateFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceVulkan11Features\">VkPhysicalDeviceVulkan11Features</a>, <a href=\"#VkPhysicalDeviceVulkan12Features\">VkPhysicalDeviceVulkan12Features</a>, <a href=\"#VkPhysicalDeviceVulkan13Features\">VkPhysicalDeviceVulkan13Features</a>, <a href=\"#VkPhysicalDeviceVulkanMemoryModelFeatures\">VkPhysicalDeviceVulkanMemoryModelFeatures</a>, <a href=\"#VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR\">VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR</a>, <a href=\"#VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT\">VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceYcbcrImageArraysFeaturesEXT\">VkPhysicalDeviceYcbcrImageArraysFeaturesEXT</a>, or <a href=\"#VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures\">VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures</a>"
+          "text": " Each <code>pNext</code> member of any structure (including this one) in the <code>pNext</code> chain <strong class=\"purple\">must</strong> be either <code>NULL</code> or a pointer to a valid instance of <a href=\"#VkDeviceDeviceMemoryReportCreateInfoEXT\">VkDeviceDeviceMemoryReportCreateInfoEXT</a>, <a href=\"#VkDeviceDiagnosticsConfigCreateInfoNV\">VkDeviceDiagnosticsConfigCreateInfoNV</a>, <a href=\"#VkDeviceGroupDeviceCreateInfo\">VkDeviceGroupDeviceCreateInfo</a>, <a href=\"#VkDeviceMemoryOverallocationCreateInfoAMD\">VkDeviceMemoryOverallocationCreateInfoAMD</a>, <a href=\"#VkDevicePrivateDataCreateInfo\">VkDevicePrivateDataCreateInfo</a>, <a href=\"#VkPhysicalDevice16BitStorageFeatures\">VkPhysicalDevice16BitStorageFeatures</a>, <a href=\"#VkPhysicalDevice4444FormatsFeaturesEXT\">VkPhysicalDevice4444FormatsFeaturesEXT</a>, <a href=\"#VkPhysicalDevice8BitStorageFeatures\">VkPhysicalDevice8BitStorageFeatures</a>, <a href=\"#VkPhysicalDeviceASTCDecodeFeaturesEXT\">VkPhysicalDeviceASTCDecodeFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceAccelerationStructureFeaturesKHR\">VkPhysicalDeviceAccelerationStructureFeaturesKHR</a>, <a href=\"#VkPhysicalDeviceAddressBindingReportFeaturesEXT\">VkPhysicalDeviceAddressBindingReportFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceAmigoProfilingFeaturesSEC\">VkPhysicalDeviceAmigoProfilingFeaturesSEC</a>, <a href=\"#VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT\">VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT\">VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceBorderColorSwizzleFeaturesEXT\">VkPhysicalDeviceBorderColorSwizzleFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceBufferDeviceAddressFeatures\">VkPhysicalDeviceBufferDeviceAddressFeatures</a>, <a href=\"#VkPhysicalDeviceBufferDeviceAddressFeaturesEXT\">VkPhysicalDeviceBufferDeviceAddressFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceCoherentMemoryFeaturesAMD\">VkPhysicalDeviceCoherentMemoryFeaturesAMD</a>, <a href=\"#VkPhysicalDeviceColorWriteEnableFeaturesEXT\">VkPhysicalDeviceColorWriteEnableFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceComputeShaderDerivativesFeaturesNV\">VkPhysicalDeviceComputeShaderDerivativesFeaturesNV</a>, <a href=\"#VkPhysicalDeviceConditionalRenderingFeaturesEXT\">VkPhysicalDeviceConditionalRenderingFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceCooperativeMatrixFeaturesNV\">VkPhysicalDeviceCooperativeMatrixFeaturesNV</a>, <a href=\"#VkPhysicalDeviceCopyMemoryIndirectFeaturesNV\">VkPhysicalDeviceCopyMemoryIndirectFeaturesNV</a>, <a href=\"#VkPhysicalDeviceCornerSampledImageFeaturesNV\">VkPhysicalDeviceCornerSampledImageFeaturesNV</a>, <a href=\"#VkPhysicalDeviceCoverageReductionModeFeaturesNV\">VkPhysicalDeviceCoverageReductionModeFeaturesNV</a>, <a href=\"#VkPhysicalDeviceCustomBorderColorFeaturesEXT\">VkPhysicalDeviceCustomBorderColorFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV\">VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV</a>, <a href=\"#VkPhysicalDeviceDepthClampZeroOneFeaturesEXT\">VkPhysicalDeviceDepthClampZeroOneFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceDepthClipControlFeaturesEXT\">VkPhysicalDeviceDepthClipControlFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceDepthClipEnableFeaturesEXT\">VkPhysicalDeviceDepthClipEnableFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceDescriptorBufferFeaturesEXT\">VkPhysicalDeviceDescriptorBufferFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceDescriptorIndexingFeatures\">VkPhysicalDeviceDescriptorIndexingFeatures</a>, <a href=\"#VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE\">VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE</a>, <a href=\"#VkPhysicalDeviceDeviceGeneratedCommandsFeaturesNV\">VkPhysicalDeviceDeviceGeneratedCommandsFeaturesNV</a>, <a href=\"#VkPhysicalDeviceDeviceMemoryReportFeaturesEXT\">VkPhysicalDeviceDeviceMemoryReportFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceDiagnosticsConfigFeaturesNV\">VkPhysicalDeviceDiagnosticsConfigFeaturesNV</a>, <a href=\"#VkPhysicalDeviceDynamicRenderingFeatures\">VkPhysicalDeviceDynamicRenderingFeatures</a>, <a href=\"#VkPhysicalDeviceExclusiveScissorFeaturesNV\">VkPhysicalDeviceExclusiveScissorFeaturesNV</a>, <a href=\"#VkPhysicalDeviceExtendedDynamicState2FeaturesEXT\">VkPhysicalDeviceExtendedDynamicState2FeaturesEXT</a>, <a href=\"#VkPhysicalDeviceExtendedDynamicState3FeaturesEXT\">VkPhysicalDeviceExtendedDynamicState3FeaturesEXT</a>, <a href=\"#VkPhysicalDeviceExtendedDynamicStateFeaturesEXT\">VkPhysicalDeviceExtendedDynamicStateFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceExternalMemoryRDMAFeaturesNV\">VkPhysicalDeviceExternalMemoryRDMAFeaturesNV</a>, <a href=\"#VkPhysicalDeviceFaultFeaturesEXT\">VkPhysicalDeviceFaultFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceFeatures2\">VkPhysicalDeviceFeatures2</a>, <a href=\"#VkPhysicalDeviceFragmentDensityMap2FeaturesEXT\">VkPhysicalDeviceFragmentDensityMap2FeaturesEXT</a>, <a href=\"#VkPhysicalDeviceFragmentDensityMapFeaturesEXT\">VkPhysicalDeviceFragmentDensityMapFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM\">VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM</a>, <a href=\"#VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR\">VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR</a>, <a href=\"#VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT\">VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceFragmentShadingRateEnumsFeaturesNV\">VkPhysicalDeviceFragmentShadingRateEnumsFeaturesNV</a>, <a href=\"#VkPhysicalDeviceFragmentShadingRateFeaturesKHR\">VkPhysicalDeviceFragmentShadingRateFeaturesKHR</a>, <a href=\"#VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR\">VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR</a>, <a href=\"#VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT\">VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceHostQueryResetFeatures\">VkPhysicalDeviceHostQueryResetFeatures</a>, <a href=\"#VkPhysicalDeviceImage2DViewOf3DFeaturesEXT\">VkPhysicalDeviceImage2DViewOf3DFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceImageCompressionControlFeaturesEXT\">VkPhysicalDeviceImageCompressionControlFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceImageCompressionControlSwapchainFeaturesEXT\">VkPhysicalDeviceImageCompressionControlSwapchainFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceImageProcessingFeaturesQCOM\">VkPhysicalDeviceImageProcessingFeaturesQCOM</a>, <a href=\"#VkPhysicalDeviceImageRobustnessFeatures\">VkPhysicalDeviceImageRobustnessFeatures</a>, <a href=\"#VkPhysicalDeviceImageViewMinLodFeaturesEXT\">VkPhysicalDeviceImageViewMinLodFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceImagelessFramebufferFeatures\">VkPhysicalDeviceImagelessFramebufferFeatures</a>, <a href=\"#VkPhysicalDeviceIndexTypeUint8FeaturesEXT\">VkPhysicalDeviceIndexTypeUint8FeaturesEXT</a>, <a href=\"#VkPhysicalDeviceInheritedViewportScissorFeaturesNV\">VkPhysicalDeviceInheritedViewportScissorFeaturesNV</a>, <a href=\"#VkPhysicalDeviceInlineUniformBlockFeatures\">VkPhysicalDeviceInlineUniformBlockFeatures</a>, <a href=\"#VkPhysicalDeviceInvocationMaskFeaturesHUAWEI\">VkPhysicalDeviceInvocationMaskFeaturesHUAWEI</a>, <a href=\"#VkPhysicalDeviceLegacyDitheringFeaturesEXT\">VkPhysicalDeviceLegacyDitheringFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceLineRasterizationFeaturesEXT\">VkPhysicalDeviceLineRasterizationFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceLinearColorAttachmentFeaturesNV\">VkPhysicalDeviceLinearColorAttachmentFeaturesNV</a>, <a href=\"#VkPhysicalDeviceMaintenance4Features\">VkPhysicalDeviceMaintenance4Features</a>, <a href=\"#VkPhysicalDeviceMemoryDecompressionFeaturesNV\">VkPhysicalDeviceMemoryDecompressionFeaturesNV</a>, <a href=\"#VkPhysicalDeviceMemoryPriorityFeaturesEXT\">VkPhysicalDeviceMemoryPriorityFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceMeshShaderFeaturesEXT\">VkPhysicalDeviceMeshShaderFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceMeshShaderFeaturesNV\">VkPhysicalDeviceMeshShaderFeaturesNV</a>, <a href=\"#VkPhysicalDeviceMultiDrawFeaturesEXT\">VkPhysicalDeviceMultiDrawFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT\">VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceMultiviewFeatures\">VkPhysicalDeviceMultiviewFeatures</a>, <a href=\"#VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT\">VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT\">VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceOpacityMicromapFeaturesEXT\">VkPhysicalDeviceOpacityMicromapFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceOpticalFlowFeaturesNV\">VkPhysicalDeviceOpticalFlowFeaturesNV</a>, <a href=\"#VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT\">VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT</a>, <a href=\"#VkPhysicalDevicePerformanceQueryFeaturesKHR\">VkPhysicalDevicePerformanceQueryFeaturesKHR</a>, <a href=\"#VkPhysicalDevicePipelineCreationCacheControlFeatures\">VkPhysicalDevicePipelineCreationCacheControlFeatures</a>, <a href=\"#VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR\">VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR</a>, <a href=\"#VkPhysicalDevicePipelinePropertiesFeaturesEXT\">VkPhysicalDevicePipelinePropertiesFeaturesEXT</a>, <a href=\"#VkPhysicalDevicePipelineProtectedAccessFeaturesEXT\">VkPhysicalDevicePipelineProtectedAccessFeaturesEXT</a>, <a href=\"#VkPhysicalDevicePipelineRobustnessFeaturesEXT\">VkPhysicalDevicePipelineRobustnessFeaturesEXT</a>, <a href=\"#VkPhysicalDevicePortabilitySubsetFeaturesKHR\">VkPhysicalDevicePortabilitySubsetFeaturesKHR</a>, <a href=\"#VkPhysicalDevicePresentBarrierFeaturesNV\">VkPhysicalDevicePresentBarrierFeaturesNV</a>, <a href=\"#VkPhysicalDevicePresentIdFeaturesKHR\">VkPhysicalDevicePresentIdFeaturesKHR</a>, <a href=\"#VkPhysicalDevicePresentWaitFeaturesKHR\">VkPhysicalDevicePresentWaitFeaturesKHR</a>, <a href=\"#VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT\">VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT</a>, <a href=\"#VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT\">VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT</a>, <a href=\"#VkPhysicalDevicePrivateDataFeatures\">VkPhysicalDevicePrivateDataFeatures</a>, <a href=\"#VkPhysicalDeviceProtectedMemoryFeatures\">VkPhysicalDeviceProtectedMemoryFeatures</a>, <a href=\"#VkPhysicalDeviceProvokingVertexFeaturesEXT\">VkPhysicalDeviceProvokingVertexFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT\">VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT\">VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceRayQueryFeaturesKHR\">VkPhysicalDeviceRayQueryFeaturesKHR</a>, <a href=\"#VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV\">VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV</a>, <a href=\"#VkPhysicalDeviceRayTracingMaintenance1FeaturesKHR\">VkPhysicalDeviceRayTracingMaintenance1FeaturesKHR</a>, <a href=\"#VkPhysicalDeviceRayTracingMotionBlurFeaturesNV\">VkPhysicalDeviceRayTracingMotionBlurFeaturesNV</a>, <a href=\"#VkPhysicalDeviceRayTracingPipelineFeaturesKHR\">VkPhysicalDeviceRayTracingPipelineFeaturesKHR</a>, <a href=\"#VkPhysicalDeviceRepresentativeFragmentTestFeaturesNV\">VkPhysicalDeviceRepresentativeFragmentTestFeaturesNV</a>, <a href=\"#VkPhysicalDeviceRobustness2FeaturesEXT\">VkPhysicalDeviceRobustness2FeaturesEXT</a>, <a href=\"#VkPhysicalDeviceSamplerYcbcrConversionFeatures\">VkPhysicalDeviceSamplerYcbcrConversionFeatures</a>, <a href=\"#VkPhysicalDeviceScalarBlockLayoutFeatures\">VkPhysicalDeviceScalarBlockLayoutFeatures</a>, <a href=\"#VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures\">VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures</a>, <a href=\"#VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT\">VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT</a>, <a href=\"#VkPhysicalDeviceShaderAtomicFloatFeaturesEXT\">VkPhysicalDeviceShaderAtomicFloatFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceShaderAtomicInt64Features\">VkPhysicalDeviceShaderAtomicInt64Features</a>, <a href=\"#VkPhysicalDeviceShaderClockFeaturesKHR\">VkPhysicalDeviceShaderClockFeaturesKHR</a>, <a href=\"#VkPhysicalDeviceShaderCoreBuiltinsFeaturesARM\">VkPhysicalDeviceShaderCoreBuiltinsFeaturesARM</a>, <a href=\"#VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures\">VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures</a>, <a href=\"#VkPhysicalDeviceShaderDrawParametersFeatures\">VkPhysicalDeviceShaderDrawParametersFeatures</a>, <a href=\"#VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD\">VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD</a>, <a href=\"#VkPhysicalDeviceShaderFloat16Int8Features\">VkPhysicalDeviceShaderFloat16Int8Features</a>, <a href=\"#VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT\">VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT</a>, <a href=\"#VkPhysicalDeviceShaderImageFootprintFeaturesNV\">VkPhysicalDeviceShaderImageFootprintFeaturesNV</a>, <a href=\"#VkPhysicalDeviceShaderIntegerDotProductFeatures\">VkPhysicalDeviceShaderIntegerDotProductFeatures</a>, <a href=\"#VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL\">VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL</a>, <a href=\"#VkPhysicalDeviceShaderModuleIdentifierFeaturesEXT\">VkPhysicalDeviceShaderModuleIdentifierFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceShaderSMBuiltinsFeaturesNV\">VkPhysicalDeviceShaderSMBuiltinsFeaturesNV</a>, <a href=\"#VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures\">VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures</a>, <a href=\"#VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR\">VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR</a>, <a href=\"#VkPhysicalDeviceShaderTerminateInvocationFeatures\">VkPhysicalDeviceShaderTerminateInvocationFeatures</a>, <a href=\"#VkPhysicalDeviceShadingRateImageFeaturesNV\">VkPhysicalDeviceShadingRateImageFeaturesNV</a>, <a href=\"#VkPhysicalDeviceSubgroupSizeControlFeatures\">VkPhysicalDeviceSubgroupSizeControlFeatures</a>, <a href=\"#VkPhysicalDeviceSubpassMergeFeedbackFeaturesEXT\">VkPhysicalDeviceSubpassMergeFeedbackFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceSubpassShadingFeaturesHUAWEI\">VkPhysicalDeviceSubpassShadingFeaturesHUAWEI</a>, <a href=\"#VkPhysicalDeviceSynchronization2Features\">VkPhysicalDeviceSynchronization2Features</a>, <a href=\"#VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT\">VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceTextureCompressionASTCHDRFeatures\">VkPhysicalDeviceTextureCompressionASTCHDRFeatures</a>, <a href=\"#VkPhysicalDeviceTilePropertiesFeaturesQCOM\">VkPhysicalDeviceTilePropertiesFeaturesQCOM</a>, <a href=\"#VkPhysicalDeviceTimelineSemaphoreFeatures\">VkPhysicalDeviceTimelineSemaphoreFeatures</a>, <a href=\"#VkPhysicalDeviceTransformFeedbackFeaturesEXT\">VkPhysicalDeviceTransformFeedbackFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceUniformBufferStandardLayoutFeatures\">VkPhysicalDeviceUniformBufferStandardLayoutFeatures</a>, <a href=\"#VkPhysicalDeviceVariablePointersFeatures\">VkPhysicalDeviceVariablePointersFeatures</a>, <a href=\"#VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT\">VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceVertexInputDynamicStateFeaturesEXT\">VkPhysicalDeviceVertexInputDynamicStateFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceVulkan11Features\">VkPhysicalDeviceVulkan11Features</a>, <a href=\"#VkPhysicalDeviceVulkan12Features\">VkPhysicalDeviceVulkan12Features</a>, <a href=\"#VkPhysicalDeviceVulkan13Features\">VkPhysicalDeviceVulkan13Features</a>, <a href=\"#VkPhysicalDeviceVulkanMemoryModelFeatures\">VkPhysicalDeviceVulkanMemoryModelFeatures</a>, <a href=\"#VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR\">VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR</a>, <a href=\"#VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT\">VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT</a>, <a href=\"#VkPhysicalDeviceYcbcrImageArraysFeaturesEXT\">VkPhysicalDeviceYcbcrImageArraysFeaturesEXT</a>, or <a href=\"#VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures\">VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures</a>"
         },
         {
           "vuid": "VUID-VkDeviceCreateInfo-sType-unique",
@@ -1759,13 +1721,13 @@
       ],
       "(VK_VERSION_1_3,VK_KHR_synchronization2)+(VK_KHR_fragment_shading_rate)+(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-VkSemaphoreSubmitInfo-stageMask-07316",
+          "vuid": "VUID-VkSemaphoreSubmitInfo-shadingRateImage-07316",
           "text": " If neither the <a href=\"#features-shadingRateImage\"><code>shadingRateImage</code></a> or <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> are enabled, pname:stageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
       "(VK_VERSION_1_3,VK_KHR_synchronization2)+(VK_KHR_fragment_shading_rate)+!(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-VkSemaphoreSubmitInfo-stageMask-07317",
+          "vuid": "VUID-VkSemaphoreSubmitInfo-fragmentShadingRate-07317",
           "text": " If the <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> feature is not enabled, pname:stageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
@@ -2001,13 +1963,13 @@
       ],
       "(VK_KHR_fragment_shading_rate)+(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-VkSubmitInfo-pWaitDstStageMask-07318",
+          "vuid": "VUID-VkSubmitInfo-shadingRateImage-07318",
           "text": " If neither the <a href=\"#features-shadingRateImage\"><code>shadingRateImage</code></a> or <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> are enabled, pname:pWaitDstStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
       "(VK_KHR_fragment_shading_rate)+!(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-VkSubmitInfo-pWaitDstStageMask-07319",
+          "vuid": "VUID-VkSubmitInfo-fragmentShadingRate-07319",
           "text": " If the <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> feature is not enabled, pname:pWaitDstStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
@@ -3048,7 +3010,7 @@
       "(VK_EXT_metal_objects)": [
         {
           "vuid": "VUID-VkSemaphoreCreateInfo-pNext-06789",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure, its <code>exportObjectType</code> member <strong class=\"purple\">must</strong> be <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_SHARED_EVENT_BIT_EXT</code>"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure, its <code>exportObjectType</code> member <strong class=\"purple\">must</strong> be <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_SHARED_EVENT_BIT_EXT</code>."
         }
       ],
       "core": [
@@ -3680,7 +3642,7 @@
       "(VK_EXT_metal_objects)": [
         {
           "vuid": "VUID-VkEventCreateInfo-pNext-06790",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure, its <code>exportObjectType</code> member <strong class=\"purple\">must</strong> be <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_SHARED_EVENT_BIT_EXT</code>"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure, its <code>exportObjectType</code> member <strong class=\"purple\">must</strong> be <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_SHARED_EVENT_BIT_EXT</code>."
         }
       ],
       "core": [
@@ -3973,13 +3935,13 @@
       ],
       "(VK_KHR_fragment_shading_rate)+(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-vkCmdSetEvent-stageMask-07318",
+          "vuid": "VUID-vkCmdSetEvent-shadingRateImage-07318",
           "text": " If neither the <a href=\"#features-shadingRateImage\"><code>shadingRateImage</code></a> or <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> are enabled, pname:stageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
       "(VK_KHR_fragment_shading_rate)+!(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-vkCmdSetEvent-stageMask-07319",
+          "vuid": "VUID-vkCmdSetEvent-fragmentShadingRate-07319",
           "text": " If the <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> feature is not enabled, pname:stageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
@@ -4093,13 +4055,13 @@
       ],
       "(VK_VERSION_1_3,VK_KHR_synchronization2)+(VK_KHR_fragment_shading_rate)+(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-vkCmdResetEvent2-stageMask-07316",
+          "vuid": "VUID-vkCmdResetEvent2-shadingRateImage-07316",
           "text": " If neither the <a href=\"#features-shadingRateImage\"><code>shadingRateImage</code></a> or <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> are enabled, pname:stageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
       "(VK_VERSION_1_3,VK_KHR_synchronization2)+(VK_KHR_fragment_shading_rate)+!(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-vkCmdResetEvent2-stageMask-07317",
+          "vuid": "VUID-vkCmdResetEvent2-fragmentShadingRate-07317",
           "text": " If the <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> feature is not enabled, pname:stageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
@@ -4209,13 +4171,13 @@
       ],
       "(VK_KHR_fragment_shading_rate)+(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-vkCmdResetEvent-stageMask-07318",
+          "vuid": "VUID-vkCmdResetEvent-shadingRateImage-07318",
           "text": " If neither the <a href=\"#features-shadingRateImage\"><code>shadingRateImage</code></a> or <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> are enabled, pname:stageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
       "(VK_KHR_fragment_shading_rate)+!(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-vkCmdResetEvent-stageMask-07319",
+          "vuid": "VUID-vkCmdResetEvent-fragmentShadingRate-07319",
           "text": " If the <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> feature is not enabled, pname:stageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
@@ -4481,21 +4443,21 @@
       ],
       "(VK_KHR_fragment_shading_rate)+(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-vkCmdWaitEvents-srcStageMask-07318",
+          "vuid": "VUID-vkCmdWaitEvents-shadingRateImage-07318",
           "text": " If neither the <a href=\"#features-shadingRateImage\"><code>shadingRateImage</code></a> or <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> are enabled, pname:srcStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         },
         {
-          "vuid": "VUID-vkCmdWaitEvents-dstStageMask-07318",
+          "vuid": "VUID-vkCmdWaitEvents-shadingRateImage-07318",
           "text": " If neither the <a href=\"#features-shadingRateImage\"><code>shadingRateImage</code></a> or <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> are enabled, pname:dstStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
       "(VK_KHR_fragment_shading_rate)+!(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-vkCmdWaitEvents-srcStageMask-07319",
+          "vuid": "VUID-vkCmdWaitEvents-fragmentShadingRate-07319",
           "text": " If the <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> feature is not enabled, pname:srcStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         },
         {
-          "vuid": "VUID-vkCmdWaitEvents-dstStageMask-07319",
+          "vuid": "VUID-vkCmdWaitEvents-fragmentShadingRate-07319",
           "text": " If the <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> feature is not enabled, pname:dstStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
@@ -4761,21 +4723,21 @@
       ],
       "(VK_KHR_fragment_shading_rate)+(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-vkCmdPipelineBarrier-srcStageMask-07318",
+          "vuid": "VUID-vkCmdPipelineBarrier-shadingRateImage-07318",
           "text": " If neither the <a href=\"#features-shadingRateImage\"><code>shadingRateImage</code></a> or <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> are enabled, pname:srcStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         },
         {
-          "vuid": "VUID-vkCmdPipelineBarrier-dstStageMask-07318",
+          "vuid": "VUID-vkCmdPipelineBarrier-shadingRateImage-07318",
           "text": " If neither the <a href=\"#features-shadingRateImage\"><code>shadingRateImage</code></a> or <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> are enabled, pname:dstStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
       "(VK_KHR_fragment_shading_rate)+!(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-vkCmdPipelineBarrier-srcStageMask-07319",
+          "vuid": "VUID-vkCmdPipelineBarrier-fragmentShadingRate-07319",
           "text": " If the <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> feature is not enabled, pname:srcStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         },
         {
-          "vuid": "VUID-vkCmdPipelineBarrier-dstStageMask-07319",
+          "vuid": "VUID-vkCmdPipelineBarrier-fragmentShadingRate-07319",
           "text": " If the <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> feature is not enabled, pname:dstStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
@@ -5087,21 +5049,21 @@
       ],
       "(VK_VERSION_1_3,VK_KHR_synchronization2)+(VK_KHR_fragment_shading_rate)+(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-VkMemoryBarrier2-srcStageMask-07316",
+          "vuid": "VUID-VkMemoryBarrier2-shadingRateImage-07316",
           "text": " If neither the <a href=\"#features-shadingRateImage\"><code>shadingRateImage</code></a> or <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> are enabled, pname:srcStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         },
         {
-          "vuid": "VUID-VkMemoryBarrier2-dstStageMask-07316",
+          "vuid": "VUID-VkMemoryBarrier2-shadingRateImage-07316",
           "text": " If neither the <a href=\"#features-shadingRateImage\"><code>shadingRateImage</code></a> or <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> are enabled, pname:dstStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
       "(VK_VERSION_1_3,VK_KHR_synchronization2)+(VK_KHR_fragment_shading_rate)+!(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-VkMemoryBarrier2-srcStageMask-07317",
+          "vuid": "VUID-VkMemoryBarrier2-fragmentShadingRate-07317",
           "text": " If the <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> feature is not enabled, pname:srcStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         },
         {
-          "vuid": "VUID-VkMemoryBarrier2-dstStageMask-07317",
+          "vuid": "VUID-VkMemoryBarrier2-fragmentShadingRate-07317",
           "text": " If the <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> feature is not enabled, pname:dstStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
@@ -5663,21 +5625,21 @@
       ],
       "(VK_VERSION_1_3,VK_KHR_synchronization2)+(VK_KHR_fragment_shading_rate)+(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-VkBufferMemoryBarrier2-srcStageMask-07316",
+          "vuid": "VUID-VkBufferMemoryBarrier2-shadingRateImage-07316",
           "text": " If neither the <a href=\"#features-shadingRateImage\"><code>shadingRateImage</code></a> or <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> are enabled, pname:srcStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         },
         {
-          "vuid": "VUID-VkBufferMemoryBarrier2-dstStageMask-07316",
+          "vuid": "VUID-VkBufferMemoryBarrier2-shadingRateImage-07316",
           "text": " If neither the <a href=\"#features-shadingRateImage\"><code>shadingRateImage</code></a> or <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> are enabled, pname:dstStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
       "(VK_VERSION_1_3,VK_KHR_synchronization2)+(VK_KHR_fragment_shading_rate)+!(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-VkBufferMemoryBarrier2-srcStageMask-07317",
+          "vuid": "VUID-VkBufferMemoryBarrier2-fragmentShadingRate-07317",
           "text": " If the <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> feature is not enabled, pname:srcStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         },
         {
-          "vuid": "VUID-VkBufferMemoryBarrier2-dstStageMask-07317",
+          "vuid": "VUID-VkBufferMemoryBarrier2-fragmentShadingRate-07317",
           "text": " If the <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> feature is not enabled, pname:dstStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
@@ -6355,21 +6317,21 @@
       ],
       "(VK_VERSION_1_3,VK_KHR_synchronization2)+(VK_KHR_fragment_shading_rate)+(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-VkImageMemoryBarrier2-srcStageMask-07316",
+          "vuid": "VUID-VkImageMemoryBarrier2-shadingRateImage-07316",
           "text": " If neither the <a href=\"#features-shadingRateImage\"><code>shadingRateImage</code></a> or <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> are enabled, pname:srcStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         },
         {
-          "vuid": "VUID-VkImageMemoryBarrier2-dstStageMask-07316",
+          "vuid": "VUID-VkImageMemoryBarrier2-shadingRateImage-07316",
           "text": " If neither the <a href=\"#features-shadingRateImage\"><code>shadingRateImage</code></a> or <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> are enabled, pname:dstStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
       "(VK_VERSION_1_3,VK_KHR_synchronization2)+(VK_KHR_fragment_shading_rate)+!(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-VkImageMemoryBarrier2-srcStageMask-07317",
+          "vuid": "VUID-VkImageMemoryBarrier2-fragmentShadingRate-07317",
           "text": " If the <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> feature is not enabled, pname:srcStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         },
         {
-          "vuid": "VUID-VkImageMemoryBarrier2-dstStageMask-07317",
+          "vuid": "VUID-VkImageMemoryBarrier2-fragmentShadingRate-07317",
           "text": " If the <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> feature is not enabled, pname:dstStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
@@ -6714,7 +6676,7 @@
       "(VK_VERSION_1_3,VK_KHR_synchronization2)+(VK_EXT_attachment_feedback_loop_layout)": [
         {
           "vuid": "VUID-VkImageMemoryBarrier2-srcQueueFamilyIndex-07006",
-          "text": " If <code>srcQueueFamilyIndex</code> and <code>dstQueueFamilyIndex</code> define a <a href=\"#synchronization-queue-transfers\">queue family ownership transfer</a> or <code>oldLayout</code> and <code>newLayout</code> define an <a href=\"#synchronization-image-layout-transitions\">image layout transition</a>, and <code>oldLayout</code> or <code>newLayout</code> is <code>VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT</code> then <code>image</code> <strong class=\"purple\">must</strong> have been created with either the <code>VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT</code> or <code>VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT</code> usage bits, and the <code>VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT</code> or <code>VK_IMAGE_USAGE_SAMPLED_BIT</code> usage bits, and the <code>VK_IMAGE_USAGE_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT</code> usage bit"
+          "text": " If <code>srcQueueFamilyIndex</code> and <code>dstQueueFamilyIndex</code> define a <a href=\"#synchronization-queue-transfers\">queue family ownership transfer</a> or <code>oldLayout</code> and <code>newLayout</code> define an <a href=\"#synchronization-image-layout-transitions\">image layout transition</a>, and <code>oldLayout</code> or <code>newLayout</code> is <code>VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT</code> then <code>image</code> <strong class=\"purple\">must</strong> have been created with either the <code>VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT</code> or <code>VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT</code> usage bits, and the <code>VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT</code> or <code>VK_IMAGE_USAGE_SAMPLED_BIT</code> usage bits, and the <code>VK_IMAGE_USAGE_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT</code> usage bit."
         },
         {
           "vuid": "VUID-VkImageMemoryBarrier2-attachmentFeedbackLoopLayout-07313",
@@ -6920,7 +6882,7 @@
       "(VK_EXT_attachment_feedback_loop_layout)": [
         {
           "vuid": "VUID-VkImageMemoryBarrier-srcQueueFamilyIndex-07006",
-          "text": " If <code>srcQueueFamilyIndex</code> and <code>dstQueueFamilyIndex</code> define a <a href=\"#synchronization-queue-transfers\">queue family ownership transfer</a> or <code>oldLayout</code> and <code>newLayout</code> define an <a href=\"#synchronization-image-layout-transitions\">image layout transition</a>, and <code>oldLayout</code> or <code>newLayout</code> is <code>VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT</code> then <code>image</code> <strong class=\"purple\">must</strong> have been created with either the <code>VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT</code> or <code>VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT</code> usage bits, and the <code>VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT</code> or <code>VK_IMAGE_USAGE_SAMPLED_BIT</code> usage bits, and the <code>VK_IMAGE_USAGE_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT</code> usage bit"
+          "text": " If <code>srcQueueFamilyIndex</code> and <code>dstQueueFamilyIndex</code> define a <a href=\"#synchronization-queue-transfers\">queue family ownership transfer</a> or <code>oldLayout</code> and <code>newLayout</code> define an <a href=\"#synchronization-image-layout-transitions\">image layout transition</a>, and <code>oldLayout</code> or <code>newLayout</code> is <code>VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT</code> then <code>image</code> <strong class=\"purple\">must</strong> have been created with either the <code>VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT</code> or <code>VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT</code> usage bits, and the <code>VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT</code> or <code>VK_IMAGE_USAGE_SAMPLED_BIT</code> usage bits, and the <code>VK_IMAGE_USAGE_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT</code> usage bit."
         },
         {
           "vuid": "VUID-VkImageMemoryBarrier-attachmentFeedbackLoopLayout-07313",
@@ -7134,11 +7096,11 @@
       "(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_multisampled_render_to_single_sampled)": [
         {
           "vuid": "VUID-VkRenderingInfo-imageView-06858",
-          "text": " If <a href=\"#subpass-multisampledrendertosinglesampled\">multisampled-render-to-single-sampled</a> is enabled, then all attachments referenced by <code>imageView</code> members of <code>pDepthAttachment</code>, <code>pStencilAttachment</code>, and elements of <code>pColorAttachments</code> that are not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a> <strong class=\"purple\">must</strong> have a sample count that is either <code>VK_SAMPLE_COUNT_1_BIT</code> or equal to <a href=\"#VkMultisampledRenderToSingleSampledInfoEXT\">VkMultisampledRenderToSingleSampledInfoEXT</a>::<code>rasterizationSamples</code>"
+          "text": " If <a href=\"#subpass-multisampledrendertosinglesampled\">multisampled-render-to-single-sampled</a> is enabled, then all attachments referenced by <code>imageView</code> members of <code>pDepthAttachment</code>, <code>pStencilAttachment</code>, and elements of <code>pColorAttachments</code> that are not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a> <strong class=\"purple\">must</strong> have a sample count that is either <code>VK_SAMPLE_COUNT_1_BIT</code> or equal to <a href=\"#VkMultisampledRenderToSingleSampledInfoEXT\">VkMultisampledRenderToSingleSampledInfoEXT</a>::<code>rasterizationSamples</code>."
         },
         {
           "vuid": "VUID-VkRenderingInfo-imageView-06859",
-          "text": " If <a href=\"#subpass-multisampledrendertosinglesampled\">multisampled-render-to-single-sampled</a> is enabled, then all attachments referenced by <code>imageView</code> members of <code>pDepthAttachment</code>, <code>pStencilAttachment</code>, and elements of <code>pColorAttachments</code> that are not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a> and have a sample count of <code>VK_SAMPLE_COUNT_1_BIT</code> <strong class=\"purple\">must</strong> have been created with <code>VK_IMAGE_CREATE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_BIT_EXT</code> in their <a href=\"#VkImageCreateInfo\">VkImageCreateInfo</a>::<code>flags</code>"
+          "text": " If <a href=\"#subpass-multisampledrendertosinglesampled\">multisampled-render-to-single-sampled</a> is enabled, then all attachments referenced by <code>imageView</code> members of <code>pDepthAttachment</code>, <code>pStencilAttachment</code>, and elements of <code>pColorAttachments</code> that are not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a> and have a sample count of <code>VK_SAMPLE_COUNT_1_BIT</code> <strong class=\"purple\">must</strong> have been created with <code>VK_IMAGE_CREATE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_BIT_EXT</code> in their <a href=\"#VkImageCreateInfo\">VkImageCreateInfo</a>::<code>flags</code>."
         }
       ],
       "(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+!(VK_VERSION_1_1,VK_KHR_device_group)": [
@@ -7227,22 +7189,6 @@
         {
           "vuid": "VUID-VkRenderingInfo-colorAttachmentCount-06101",
           "text": " If <code>colorAttachmentCount</code> is not <code>0</code> and the <code>imageView</code> member of an element of <code>pColorAttachments</code> is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, if the <code>resolveMode</code> member of that element of <code>pColorAttachments</code> is not <code>VK_RESOLVE_MODE_NONE</code>, its <code>resolveImageLayout</code> member <strong class=\"purple\">must</strong> not be <code>VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL</code>, <code>VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL</code>, <code>VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL</code>, or <code>VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL</code>"
-        },
-        {
-          "vuid": "VUID-VkRenderingInfo-pDepthAttachment-07732",
-          "text": " If <code>pDepthAttachment</code> is not <code>NULL</code> and <code>pDepthAttachment-&gt;imageView</code> is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, <code>pDepthAttachment-&gt;layout</code> <strong class=\"purple\">must</strong> not be <code>VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL</code> or <code>VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL</code>"
-        },
-        {
-          "vuid": "VUID-VkRenderingInfo-pDepthAttachment-07733",
-          "text": " If <code>pDepthAttachment</code> is not <code>NULL</code>, <code>pDepthAttachment-&gt;imageView</code> is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, and <code>pDepthAttachment-&gt;resolveMode</code> is not <code>VK_RESOLVE_MODE_NONE</code>, <code>pDepthAttachment-&gt;resolveImageLayout</code> <strong class=\"purple\">must</strong> not be <code>VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL</code> or <code>VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL</code>"
-        },
-        {
-          "vuid": "VUID-VkRenderingInfo-pStencilAttachment-07734",
-          "text": " If <code>pStencilAttachment</code> is not <code>NULL</code> and <code>pStencilAttachment-&gt;imageView</code> is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, <code>pStencilAttachment-&gt;layout</code> <strong class=\"purple\">must</strong> not be <code>VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL</code> or <code>VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL</code>"
-        },
-        {
-          "vuid": "VUID-VkRenderingInfo-pStencilAttachment-07735",
-          "text": " If <code>pStencilAttachment</code> is not <code>NULL</code>, <code>pStencilAttachment-&gt;imageView</code> is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, and <code>pStencilAttachment-&gt;resolveMode</code> is not <code>VK_RESOLVE_MODE_NONE</code>, <code>pStencilAttachment-&gt;resolveImageLayout</code> <strong class=\"purple\">must</strong> not be <code>VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL</code> or <code>VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL</code>"
         }
       ],
       "(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_fragment_density_map)": [
@@ -7598,7 +7544,7 @@
         },
         {
           "vuid": "VUID-vkCmdEndRendering-None-06999",
-          "text": " If <code>vkCmdBeginQuery</code>* was called within the render pass, the corresponding <code>vkCmdEndQuery</code>* <strong class=\"purple\">must</strong> have been called subsequently within the same subpass"
+          "text": " If <code>vkCmdBeginQuery</code>* was called within the render pass, the corresponding <code>vkCmdEndQuery</code>* <strong class=\"purple\">must</strong> have been called subsequently within the same subpass."
         },
         {
           "vuid": "VUID-vkCmdEndRendering-commandBuffer-parameter",
@@ -8413,21 +8359,21 @@
       ],
       "(VK_KHR_fragment_shading_rate)+(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-VkSubpassDependency-srcStageMask-07318",
+          "vuid": "VUID-VkSubpassDependency-shadingRateImage-07318",
           "text": " If neither the <a href=\"#features-shadingRateImage\"><code>shadingRateImage</code></a> or <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> are enabled, pname:srcStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         },
         {
-          "vuid": "VUID-VkSubpassDependency-dstStageMask-07318",
+          "vuid": "VUID-VkSubpassDependency-shadingRateImage-07318",
           "text": " If neither the <a href=\"#features-shadingRateImage\"><code>shadingRateImage</code></a> or <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> are enabled, pname:dstStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
       "(VK_KHR_fragment_shading_rate)+!(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-VkSubpassDependency-srcStageMask-07319",
+          "vuid": "VUID-VkSubpassDependency-fragmentShadingRate-07319",
           "text": " If the <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> feature is not enabled, pname:srcStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         },
         {
-          "vuid": "VUID-VkSubpassDependency-dstStageMask-07319",
+          "vuid": "VUID-VkSubpassDependency-fragmentShadingRate-07319",
           "text": " If the <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> feature is not enabled, pname:dstStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
@@ -9451,21 +9397,21 @@
       ],
       "(VK_VERSION_1_2,VK_KHR_create_renderpass2)+(VK_KHR_fragment_shading_rate)+(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-VkSubpassDependency2-srcStageMask-07318",
+          "vuid": "VUID-VkSubpassDependency2-shadingRateImage-07318",
           "text": " If neither the <a href=\"#features-shadingRateImage\"><code>shadingRateImage</code></a> or <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> are enabled, pname:srcStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         },
         {
-          "vuid": "VUID-VkSubpassDependency2-dstStageMask-07318",
+          "vuid": "VUID-VkSubpassDependency2-shadingRateImage-07318",
           "text": " If neither the <a href=\"#features-shadingRateImage\"><code>shadingRateImage</code></a> or <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> are enabled, pname:dstStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
       "(VK_VERSION_1_2,VK_KHR_create_renderpass2)+(VK_KHR_fragment_shading_rate)+!(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-VkSubpassDependency2-srcStageMask-07319",
+          "vuid": "VUID-VkSubpassDependency2-fragmentShadingRate-07319",
           "text": " If the <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> feature is not enabled, pname:srcStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         },
         {
-          "vuid": "VUID-VkSubpassDependency2-dstStageMask-07319",
+          "vuid": "VUID-VkSubpassDependency2-fragmentShadingRate-07319",
           "text": " If the <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> feature is not enabled, pname:dstStageMask <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
@@ -9676,7 +9622,7 @@
       "(VK_EXT_fragment_density_map)+(VK_QCOM_fragment_density_map_offset)": [
         {
           "vuid": "VUID-VkFramebufferCreateInfo-renderPass-06502",
-          "text": " If <code>renderPass</code> was created with <a href=\"#renderpass-fragmentdensitymapoffsets\">fragment density map offsets</a> other than <span class=\"eq\">(0,0)</span>, each element of <code>pAttachments</code> <strong class=\"purple\">must</strong> have been created with a <code>flags</code> value including <code>VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM</code>"
+          "text": " If <code>renderPass</code> was created with <a href=\"#renderpass-fragmentdensitymapoffsets\">fragment density map offsets</a> other than <span class=\"eq\">(0,0)</span>, each element of <code>pAttachments</code> <strong class=\"purple\">must</strong> have been created with a <code>flags</code> value including <code>VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM</code>."
         }
       ],
       "(VK_VERSION_1_1,VK_KHR_multiview)": [
@@ -9832,7 +9778,7 @@
       "(VK_EXT_multisampled_render_to_single_sampled)": [
         {
           "vuid": "VUID-VkFramebufferCreateInfo-samples-06881",
-          "text": " If <a href=\"#subpass-multisampledrendertosinglesampled\">multisampled-render-to-single-sampled</a> is enabled for any subpass, all color, depth/stencil and input attachments used in that subpass which have <code>VkAttachmentDescription</code>::<code>samples</code> or <code>VkAttachmentDescription2</code>::<code>samples</code> equal to <code>VK_SAMPLE_COUNT_1_BIT</code> <strong class=\"purple\">must</strong> have been created with <code>VK_IMAGE_CREATE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_BIT_EXT</code> in their <a href=\"#VkImageCreateInfo\">VkImageCreateInfo</a>::<code>flags</code>"
+          "text": " If <a href=\"#subpass-multisampledrendertosinglesampled\">multisampled-render-to-single-sampled</a> is enabled for any subpass, all color, depth/stencil and input attachments used in that subpass which have <code>VkAttachmentDescription</code>::<code>samples</code> or <code>VkAttachmentDescription2</code>::<code>samples</code> equal to <code>VK_SAMPLE_COUNT_1_BIT</code> <strong class=\"purple\">must</strong> have been created with <code>VK_IMAGE_CREATE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_BIT_EXT</code> in their <a href=\"#VkImageCreateInfo\">VkImageCreateInfo</a>::<code>flags</code>."
         },
         {
           "vuid": "VUID-VkFramebufferCreateInfo-samples-07009",
@@ -10004,11 +9950,11 @@
       "(VK_EXT_attachment_feedback_loop_layout)": [
         {
           "vuid": "VUID-vkCmdBeginRenderPass-initialLayout-07000",
-          "text": " If any of the <code>initialLayout</code> or <code>finalLayout</code> member of the <code>VkAttachmentDescription</code> structures or the <code>layout</code> member of the <code>VkAttachmentReference</code> structures specified when creating the render pass specified in the <code>renderPass</code> member of <code>pRenderPassBegin</code> is <code>VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT</code> then the corresponding attachment image view of the framebuffer specified in the <code>framebuffer</code> member of <code>pRenderPassBegin</code> <strong class=\"purple\">must</strong> have been created with a <code>usage</code> value including either the <code>VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT</code> or <code>VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT</code> and either the <code>VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT</code> or <code>VK_IMAGE_USAGE_SAMPLED_BIT</code> usage bits"
+          "text": " If any of the <code>initialLayout</code> or <code>finalLayout</code> member of the <code>VkAttachmentDescription</code> structures or the <code>layout</code> member of the <code>VkAttachmentReference</code> structures specified when creating the render pass specified in the <code>renderPass</code> member of <code>pRenderPassBegin</code> is <code>VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT</code> then the corresponding attachment image view of the framebuffer specified in the <code>framebuffer</code> member of <code>pRenderPassBegin</code> <strong class=\"purple\">must</strong> have been created with a <code>usage</code> value including either the <code>VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT</code> or <code>VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT</code> and either the <code>VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT</code> or <code>VK_IMAGE_USAGE_SAMPLED_BIT</code> usage bits."
         },
         {
           "vuid": "VUID-vkCmdBeginRenderPass-initialLayout-07001",
-          "text": " If any of the <code>initialLayout</code> or <code>finalLayout</code> member of the <code>VkAttachmentDescription</code> structures or the <code>layout</code> member of the <code>VkAttachmentReference</code> structures specified when creating the render pass specified in the <code>renderPass</code> member of <code>pRenderPassBegin</code> is <code>VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT</code> then the corresponding attachment image view of the framebuffer specified in the <code>framebuffer</code> member of <code>pRenderPassBegin</code> <strong class=\"purple\">must</strong> have been created with a <code>usage</code> value the <code>VK_IMAGE_USAGE_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT</code> usage bit"
+          "text": " If any of the <code>initialLayout</code> or <code>finalLayout</code> member of the <code>VkAttachmentDescription</code> structures or the <code>layout</code> member of the <code>VkAttachmentReference</code> structures specified when creating the render pass specified in the <code>renderPass</code> member of <code>pRenderPassBegin</code> is <code>VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT</code> then the corresponding attachment image view of the framebuffer specified in the <code>framebuffer</code> member of <code>pRenderPassBegin</code> <strong class=\"purple\">must</strong> have been created with a <code>usage</code> value the <code>VK_IMAGE_USAGE_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT</code> usage bit."
         }
       ]
     },
@@ -10100,11 +10046,11 @@
       "(VK_VERSION_1_2,VK_KHR_create_renderpass2)+(VK_EXT_attachment_feedback_loop_layout)": [
         {
           "vuid": "VUID-vkCmdBeginRenderPass2-initialLayout-07002",
-          "text": " If any of the <code>initialLayout</code> or <code>finalLayout</code> member of the <code>VkAttachmentDescription</code> structures or the <code>layout</code> member of the <code>VkAttachmentReference</code> structures specified when creating the render pass specified in the <code>renderPass</code> member of <code>pRenderPassBegin</code> is <code>VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT</code> then the corresponding attachment image view of the framebuffer specified in the <code>framebuffer</code> member of <code>pRenderPassBegin</code> <strong class=\"purple\">must</strong> have been created with a <code>usage</code> value including either the <code>VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT</code> or <code>VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT</code> and either the <code>VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT</code> or <code>VK_IMAGE_USAGE_SAMPLED_BIT</code> usage bits"
+          "text": " If any of the <code>initialLayout</code> or <code>finalLayout</code> member of the <code>VkAttachmentDescription</code> structures or the <code>layout</code> member of the <code>VkAttachmentReference</code> structures specified when creating the render pass specified in the <code>renderPass</code> member of <code>pRenderPassBegin</code> is <code>VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT</code> then the corresponding attachment image view of the framebuffer specified in the <code>framebuffer</code> member of <code>pRenderPassBegin</code> <strong class=\"purple\">must</strong> have been created with a <code>usage</code> value including either the <code>VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT</code> or <code>VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT</code> and either the <code>VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT</code> or <code>VK_IMAGE_USAGE_SAMPLED_BIT</code> usage bits."
         },
         {
           "vuid": "VUID-vkCmdBeginRenderPass2-initialLayout-07003",
-          "text": " If any of the <code>initialLayout</code> or <code>finalLayout</code> member of the <code>VkAttachmentDescription</code> structures or the <code>layout</code> member of the <code>VkAttachmentReference</code> structures specified when creating the render pass specified in the <code>renderPass</code> member of <code>pRenderPassBegin</code> is <code>VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT</code> then the corresponding attachment image view of the framebuffer specified in the <code>framebuffer</code> member of <code>pRenderPassBegin</code> <strong class=\"purple\">must</strong> have been created with a <code>usage</code> value the <code>VK_IMAGE_USAGE_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT</code> usage bit"
+          "text": " If any of the <code>initialLayout</code> or <code>finalLayout</code> member of the <code>VkAttachmentDescription</code> structures or the <code>layout</code> member of the <code>VkAttachmentReference</code> structures specified when creating the render pass specified in the <code>renderPass</code> member of <code>pRenderPassBegin</code> is <code>VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT</code> then the corresponding attachment image view of the framebuffer specified in the <code>framebuffer</code> member of <code>pRenderPassBegin</code> <strong class=\"purple\">must</strong> have been created with a <code>usage</code> value the <code>VK_IMAGE_USAGE_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT</code> usage bit."
         }
       ]
     },
@@ -10514,7 +10460,7 @@
         },
         {
           "vuid": "VUID-vkCmdEndRenderPass-None-07004",
-          "text": " If <code>vkCmdBeginQuery</code>* was called within a subpass of the render pass, the corresponding <code>vkCmdEndQuery</code>* <strong class=\"purple\">must</strong> have been called subsequently within the same subpass"
+          "text": " If <code>vkCmdBeginQuery</code>* was called within a subpass of the render pass, the corresponding <code>vkCmdEndQuery</code>* <strong class=\"purple\">must</strong> have been called subsequently within the same subpass."
         },
         {
           "vuid": "VUID-vkCmdEndRenderPass-commandBuffer-parameter",
@@ -10562,7 +10508,7 @@
         },
         {
           "vuid": "VUID-vkCmdEndRenderPass2-None-07005",
-          "text": " If <code>vkCmdBeginQuery</code>* was called within a subpass of the render pass, the corresponding <code>vkCmdEndQuery</code>* <strong class=\"purple\">must</strong> have been called subsequently within the same subpass"
+          "text": " If <code>vkCmdBeginQuery</code>* was called within a subpass of the render pass, the corresponding <code>vkCmdEndQuery</code>* <strong class=\"purple\">must</strong> have been called subsequently within the same subpass."
         },
         {
           "vuid": "VUID-vkCmdEndRenderPass2-commandBuffer-parameter",
@@ -10626,47 +10572,47 @@
       "(VK_VERSION_1_2,VK_KHR_create_renderpass2)+(VK_QCOM_fragment_density_map_offset)": [
         {
           "vuid": "VUID-VkSubpassFragmentDensityMapOffsetEndInfoQCOM-fragmentDensityMapOffsets-06503",
-          "text": " If the <a href=\"#features-fragmentDensityMapOffsets\"><code>fragmentDensityMapOffsets</code></a> feature is not enabled or fragment density map is not enabled in the render pass, <code>fragmentDensityOffsetCount</code> <strong class=\"purple\">must</strong> equal <code>0</code>"
+          "text": " If the <a href=\"#features-fragmentDensityMapOffsets\"><code>fragmentDensityMapOffsets</code></a> feature is not enabled or fragment density map is not enabled in the render pass, <code>fragmentDensityOffsetCount</code> <strong class=\"purple\">must</strong> equal <code>0</code>."
         },
         {
           "vuid": "VUID-VkSubpassFragmentDensityMapOffsetEndInfoQCOM-fragmentDensityMapAttachment-06504",
-          "text": " If <code>VkSubpassDescription</code>::<code>fragmentDensityMapAttachment</code> is not is not <code>VK_ATTACHMENT_UNUSED</code> and was not created with <code>VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM</code>, <code>fragmentDensityOffsetCount</code> <strong class=\"purple\">must</strong> equal <code>0</code>"
+          "text": " If <code>VkSubpassDescription</code>::<code>fragmentDensityMapAttachment</code> is not is not <code>VK_ATTACHMENT_UNUSED</code> and was not created with <code>VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM</code>, <code>fragmentDensityOffsetCount</code> <strong class=\"purple\">must</strong> equal <code>0</code>."
         },
         {
           "vuid": "VUID-VkSubpassFragmentDensityMapOffsetEndInfoQCOM-pDepthStencilAttachment-06505",
-          "text": " If <code>VkSubpassDescription</code>::<code>pDepthStencilAttachment</code> is not is not <code>VK_ATTACHMENT_UNUSED</code> and was not created with <code>VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM</code>, <code>fragmentDensityOffsetCount</code> <strong class=\"purple\">must</strong> equal <code>0</code>"
+          "text": " If <code>VkSubpassDescription</code>::<code>pDepthStencilAttachment</code> is not is not <code>VK_ATTACHMENT_UNUSED</code> and was not created with <code>VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM</code>, <code>fragmentDensityOffsetCount</code> <strong class=\"purple\">must</strong> equal <code>0</code>."
         },
         {
           "vuid": "VUID-VkSubpassFragmentDensityMapOffsetEndInfoQCOM-pInputAttachments-06506",
-          "text": " If any element of <code>VkSubpassDescription</code>::<code>pInputAttachments</code> is not is not <code>VK_ATTACHMENT_UNUSED</code> and was not created with <code>VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM</code>, <code>fragmentDensityOffsetCount</code> <strong class=\"purple\">must</strong> equal <code>0</code>"
+          "text": " If any element of <code>VkSubpassDescription</code>::<code>pInputAttachments</code> is not is not <code>VK_ATTACHMENT_UNUSED</code> and was not created with <code>VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM</code>, <code>fragmentDensityOffsetCount</code> <strong class=\"purple\">must</strong> equal <code>0</code>."
         },
         {
           "vuid": "VUID-VkSubpassFragmentDensityMapOffsetEndInfoQCOM-pColorAttachments-06507",
-          "text": " If any element of <code>VkSubpassDescription</code>::<code>pColorAttachments</code> is not is not <code>VK_ATTACHMENT_UNUSED</code> and was not created with <code>VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM</code>, <code>fragmentDensityOffsetCount</code> <strong class=\"purple\">must</strong> equal <code>0</code>"
+          "text": " If any element of <code>VkSubpassDescription</code>::<code>pColorAttachments</code> is not is not <code>VK_ATTACHMENT_UNUSED</code> and was not created with <code>VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM</code>, <code>fragmentDensityOffsetCount</code> <strong class=\"purple\">must</strong> equal <code>0</code>."
         },
         {
           "vuid": "VUID-VkSubpassFragmentDensityMapOffsetEndInfoQCOM-pResolveAttachments-06508",
-          "text": " If any element of <code>VkSubpassDescription</code>::<code>pResolveAttachments</code> is not is not <code>VK_ATTACHMENT_UNUSED</code> and was not created with <code>VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM</code>, <code>fragmentDensityOffsetCount</code> <strong class=\"purple\">must</strong> equal <code>0</code>"
+          "text": " If any element of <code>VkSubpassDescription</code>::<code>pResolveAttachments</code> is not is not <code>VK_ATTACHMENT_UNUSED</code> and was not created with <code>VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM</code>, <code>fragmentDensityOffsetCount</code> <strong class=\"purple\">must</strong> equal <code>0</code>."
         },
         {
           "vuid": "VUID-VkSubpassFragmentDensityMapOffsetEndInfoQCOM-pPreserveAttachments-06509",
-          "text": " If any element of <code>VkSubpassDescription</code>::<code>pPreserveAttachments</code> is not is not <code>VK_ATTACHMENT_UNUSED</code> and was not created with <code>VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM</code>, <code>fragmentDensityOffsetCount</code> <strong class=\"purple\">must</strong> equal <code>0</code>"
+          "text": " If any element of <code>VkSubpassDescription</code>::<code>pPreserveAttachments</code> is not is not <code>VK_ATTACHMENT_UNUSED</code> and was not created with <code>VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM</code>, <code>fragmentDensityOffsetCount</code> <strong class=\"purple\">must</strong> equal <code>0</code>."
         },
         {
           "vuid": "VUID-VkSubpassFragmentDensityMapOffsetEndInfoQCOM-fragmentDensityOffsetCount-06510",
-          "text": " If <code>fragmentDensityOffsetCount</code> is not <code>0</code> and multiview is enabled for the render pass, <code>fragmentDensityOffsetCount</code> <strong class=\"purple\">must</strong> equal the <code>layerCount</code> that was specified in creating the fragment density map attachment view"
+          "text": " If <code>fragmentDensityOffsetCount</code> is not <code>0</code> and multiview is enabled for the render pass, <code>fragmentDensityOffsetCount</code> <strong class=\"purple\">must</strong> equal the <code>layerCount</code> that was specified in creating the fragment density map attachment view."
         },
         {
           "vuid": "VUID-VkSubpassFragmentDensityMapOffsetEndInfoQCOM-fragmentDensityOffsetCount-06511",
-          "text": " If <code>fragmentDensityOffsetCount</code> is not <code>0</code> and multiview is not enabled for the render pass, <code>fragmentDensityOffsetCount</code> <strong class=\"purple\">must</strong> equal <code>1</code>"
+          "text": " If <code>fragmentDensityOffsetCount</code> is not <code>0</code> and multiview is not enabled for the render pass, <code>fragmentDensityOffsetCount</code> <strong class=\"purple\">must</strong> equal <code>1</code>."
         },
         {
           "vuid": "VUID-VkSubpassFragmentDensityMapOffsetEndInfoQCOM-x-06512",
-          "text": " The <code>x</code> component of each element of <code>pFragmentDensityOffsets</code> <strong class=\"purple\">must</strong> be an integer multiple of <code>fragmentDensityOffsetGranularity.width</code>"
+          "text": " The <code>x</code> component of each element of <code>pFragmentDensityOffsets</code> <strong class=\"purple\">must</strong> be an integer multiple of <code>fragmentDensityOffsetGranularity.width</code>."
         },
         {
           "vuid": "VUID-VkSubpassFragmentDensityMapOffsetEndInfoQCOM-y-06513",
-          "text": " The <code>y</code> component of each element of <code>pFragmentDensityOffsets</code> <strong class=\"purple\">must</strong> be an integer multiple of <code>fragmentDensityOffsetGranularity.height</code>"
+          "text": " The <code>y</code> component of each element of <code>pFragmentDensityOffsets</code> <strong class=\"purple\">must</strong> be an integer multiple of <code>fragmentDensityOffsetGranularity.height</code>."
         },
         {
           "vuid": "VUID-VkSubpassFragmentDensityMapOffsetEndInfoQCOM-sType-sType",
@@ -11738,19 +11684,19 @@
         },
         {
           "vuid": "VUID-VkGraphicsPipelineCreateInfo-TessellationEvaluation-07723",
-          "text": " If the pipeline is being created with a <code>TessellationEvaluation</code> {ExecutionModel}, no <code>Geometry</code> {ExecutionModel}, uses the <code>PointMode</code> {ExecutionMode}, and <a href=\"#features-shaderTessellationAndGeometryPointSize\"><code>shaderTessellationAndGeometryPointSize</code></a> is enabled, a <code>PointSize</code> decorated variable <strong class=\"purple\">must</strong> be written to"
+          "text": " If the pipeline is being created with a <code>TessellationEvaluation</code> {ExecutionModel}, no <code>Geometry</code> {ExecutionModel}, uses the <code>PointMode</code> {ExecutionMode}, and <a href=\"#features-shaderTessellationAndGeometryPointSize\">shaderTessellationAndGeometryPointSize</a> is enabled, a <code>PointSize</code> decorated variable <strong class=\"purple\">must</strong> be written to"
         },
         {
           "vuid": "VUID-VkGraphicsPipelineCreateInfo-TessellationEvaluation-07724",
-          "text": " If the pipeline is being created with a <code>TessellationEvaluation</code> {ExecutionModel}, no <code>Geometry</code> {ExecutionModel}, uses the <code>PointMode</code> {ExecutionMode}, and <a href=\"#features-shaderTessellationAndGeometryPointSize\"><code>shaderTessellationAndGeometryPointSize</code></a> is not enabled, a <code>PointSize</code> decorated variable <strong class=\"purple\">must</strong> not be written to"
+          "text": " If the pipeline is being created with a <code>TessellationEvaluation</code> {ExecutionModel}, no <code>Geometry</code> {ExecutionModel}, uses the <code>PointMode</code> {ExecutionMode}, and <a href=\"#features-shaderTessellationAndGeometryPointSize\">shaderTessellationAndGeometryPointSize</a> is not enabled, a <code>PointSize</code> decorated variable <strong class=\"purple\">must</strong> not be written to"
         },
         {
           "vuid": "VUID-VkGraphicsPipelineCreateInfo-Geometry-07725",
-          "text": " If the pipeline is being created with a <code>Geometry</code> {ExecutionModel}, uses the <code>OutputPoints</code> {ExecutionMode}, and <a href=\"#features-shaderTessellationAndGeometryPointSize\"><code>shaderTessellationAndGeometryPointSize</code></a> is enabled, a <code>PointSize</code> decorated variable <strong class=\"purple\">must</strong> be written to"
+          "text": " If the pipeline is being created with a <code>Geometry</code> {ExecutionModel}, uses the <code>OutputPoints</code> {ExecutionMode}, and <a href=\"#features-shaderTessellationAndGeometryPointSize\">shaderTessellationAndGeometryPointSize</a> is enabled, a <code>PointSize</code> decorated variable <strong class=\"purple\">must</strong> be written to"
         },
         {
           "vuid": "VUID-VkGraphicsPipelineCreateInfo-Geometry-07726",
-          "text": " If the pipeline is being created with a <code>Geometry</code> {ExecutionModel}, uses the <code>OutputPoints</code> {ExecutionMode}, and <a href=\"#features-shaderTessellationAndGeometryPointSize\"><code>shaderTessellationAndGeometryPointSize</code></a> is not enabled, a <code>PointSize</code> decorated variable <strong class=\"purple\">must</strong> not be written to"
+          "text": " If the pipeline is being created with a <code>Geometry</code> {ExecutionModel}, uses the <code>OutputPoints</code> {ExecutionMode}, and <a href=\"#features-shaderTessellationAndGeometryPointSize\">shaderTessellationAndGeometryPointSize</a> is not enabled, a <code>PointSize</code> decorated variable <strong class=\"purple\">must</strong> not be written to"
         },
         {
           "vuid": "VUID-VkGraphicsPipelineCreateInfo-pStages-00738",
@@ -12142,7 +12088,7 @@
         },
         {
           "vuid": "VUID-VkGraphicsPipelineCreateInfo-renderPass-06854",
-          "text": " If <code>renderPass</code> is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, the <code><a href=\"#VK_EXT_multisampled_render_to_single_sampled\">VK_EXT_multisampled_render_to_single_sampled</a></code> extension is enabled, and <code>subpass</code> has a <a href=\"#VkMultisampledRenderToSingleSampledInfoEXT\">VkMultisampledRenderToSingleSampledInfoEXT</a> structure included in the <a href=\"#VkSubpassDescription2\">VkSubpassDescription2</a>::<code>pNext</code> chain with <code>multisampledRenderToSingleSampledEnable</code> equal to <code>VK_TRUE</code>, then the <code>rasterizationSamples</code> member of <code>pMultisampleState</code> <strong class=\"purple\">must</strong> be equal to <a href=\"#VkMultisampledRenderToSingleSampledInfoEXT\">VkMultisampledRenderToSingleSampledInfoEXT</a>::<code>rasterizationSamples</code>"
+          "text": " If <code>renderPass</code> is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, the <code><a href=\"#VK_EXT_multisampled_render_to_single_sampled\">VK_EXT_multisampled_render_to_single_sampled</a></code> extension is enabled, and <code>subpass</code> has a <a href=\"#VkMultisampledRenderToSingleSampledInfoEXT\">VkMultisampledRenderToSingleSampledInfoEXT</a> structure included in the <a href=\"#VkSubpassDescription2\">VkSubpassDescription2</a>::<code>pNext</code> chain with <code>multisampledRenderToSingleSampledEnable</code> equal to <code>VK_TRUE</code>, then the <code>rasterizationSamples</code> member of <code>pMultisampleState</code> <strong class=\"purple\">must</strong> be equal to <a href=\"#VkMultisampledRenderToSingleSampledInfoEXT\">VkMultisampledRenderToSingleSampledInfoEXT</a>::<code>rasterizationSamples</code>."
         }
       ],
       "(VK_AMD_mixed_attachment_samples)": [
@@ -13008,16 +12954,6 @@
           "vuid": "VUID-VkGraphicsPipelineCreateInfo-flags-07401",
           "text": " <code>flags</code> <strong class=\"purple\">must</strong> not include <code>VK_PIPELINE_CREATE_RAY_TRACING_OPACITY_MICROMAP_BIT_EXT</code>"
         }
-      ],
-      "(VK_QCOM_multiview_per_view_viewports)": [
-        {
-          "vuid": "VUID-VkGraphicsPipelineCreateInfo-pDynamicStates-07730",
-          "text": "    If the pipeline is being created with    <a href=\"#pipelines-graphics-subsets-pre-rasterization\">pre-rasterization shader    state</a>, and no element of the <code>pDynamicStates</code> member of    <code>pDynamicState</code> is <code>VK_DYNAMIC_STATE_VIEWPORT</code> or    <code>VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT</code>, and if    <a href=\"#features-multiview-per-view-viewports\">multiviewPerViewViewports</a> is enabled, then the index of the most    significant bit in each element of    <a href=\"#VkRenderPassMultiviewCreateInfo\">VkRenderPassMultiviewCreateInfo</a>::<code>pViewMasks</code> <strong class=\"purple\">must</strong> be less    than <code>pViewportState</code>::<code>viewportCount</code>"
-        },
-        {
-          "vuid": "VUID-VkGraphicsPipelineCreateInfo-pDynamicStates-07731",
-          "text": "    If the pipeline is being created with    <a href=\"#pipelines-graphics-subsets-pre-rasterization\">pre-rasterization shader    state</a>, and no element of the <code>pDynamicStates</code> member of    <code>pDynamicState</code> is <code>VK_DYNAMIC_STATE_SCISSOR</code> or    <code>VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT</code>, and if    <a href=\"#features-multiview-per-view-viewports\">multiviewPerViewViewports</a> is enabled, then the index of the most    significant bit in each element of    <a href=\"#VkRenderPassMultiviewCreateInfo\">VkRenderPassMultiviewCreateInfo</a>::<code>pViewMasks</code> <strong class=\"purple\">must</strong> be less    than <code>pViewportState</code>::<code>scissorCount</code>"
-        }
       ]
     },
     "VkPipelineRenderingCreateInfo": {
@@ -14156,7 +14092,7 @@
       "core": [
         {
           "vuid": "VUID-VkSpecializationMapEntry-constantID-00776",
-          "text": " For a <code>constantID</code> specialization constant declared in a shader, <code>size</code> <strong class=\"purple\">must</strong> match the byte size of the <code>constantID</code>. If the specialization constant is of type <code>boolean</code>, <code>size</code> <strong class=\"purple\">must</strong> be the byte size of <a href=\"#VkBool32\">VkBool32</a>"
+          "text": " For a <code>constantID</code> specialization constant declared in a shader, <code>size</code> <strong class=\"purple\">must</strong> match the byte size of the <code>constantID</code>. If the specialization constant is of type <code>boolean</code>, <code>size</code> <strong class=\"purple\">must</strong> be the byte size of <code>VkBool32</code>"
         }
       ]
     },
@@ -14330,7 +14266,7 @@
       "(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_multisampled_render_to_single_sampled)": [
         {
           "vuid": "VUID-vkCmdBindPipeline-pipeline-06856",
-          "text": " If <code>pipeline</code> is a graphics pipeline, this command has been called inside a render pass instance started with <a href=\"#vkCmdBeginRendering\">vkCmdBeginRendering</a>, and the <code>pNext</code> chain of <a href=\"#VkRenderingInfo\">VkRenderingInfo</a> includes a <a href=\"#VkMultisampledRenderToSingleSampledInfoEXT\">VkMultisampledRenderToSingleSampledInfoEXT</a> structure with <code>multisampledRenderToSingleSampledEnable</code> equal to <code>VK_TRUE</code>, then the value of <a href=\"#VkGraphicsPipelineCreateInfo\">VkGraphicsPipelineCreateInfo</a>::<code>pMultisampleState</code>::<code>rasterizationSamples</code> <strong class=\"purple\">must</strong> be equal to <a href=\"#VkMultisampledRenderToSingleSampledInfoEXT\">VkMultisampledRenderToSingleSampledInfoEXT</a>::<code>rasterizationSamples</code>"
+          "text": " If <code>pipeline</code> is a graphics pipeline, this command has been called inside a render pass instance started with <a href=\"#vkCmdBeginRendering\">vkCmdBeginRendering</a>, and the <code>pNext</code> chain of <a href=\"#VkRenderingInfo\">VkRenderingInfo</a> includes a <a href=\"#VkMultisampledRenderToSingleSampledInfoEXT\">VkMultisampledRenderToSingleSampledInfoEXT</a> structure with <code>multisampledRenderToSingleSampledEnable</code> equal to <code>VK_TRUE</code>, then the value of <a href=\"#VkGraphicsPipelineCreateInfo\">VkGraphicsPipelineCreateInfo</a>::<code>pMultisampleState</code>::<code>rasterizationSamples</code> <strong class=\"purple\">must</strong> be equal to <a href=\"#VkMultisampledRenderToSingleSampledInfoEXT\">VkMultisampledRenderToSingleSampledInfoEXT</a>::<code>rasterizationSamples</code>."
         }
       ],
       "(VK_EXT_graphics_pipeline_library)": [
@@ -14794,7 +14730,7 @@
         },
         {
           "vuid": "VUID-VkMemoryAllocateInfo-pNext-06383",
-          "text": " If the parameters define an import operation from an <a href=\"#VkBufferCollectionFUCHSIA\">VkBufferCollectionFUCHSIA</a>, the <code>pNext</code> chain <strong class=\"purple\">must</strong> include a <a href=\"#VkMemoryDedicatedAllocateInfo\">VkMemoryDedicatedAllocateInfo</a> structure with either its <code>image</code> or <code>buffer</code> field set to a value other than <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>"
+          "text": " If the parameters define an import operation from an <a href=\"#VkBufferCollectionFUCHSIA\">VkBufferCollectionFUCHSIA</a>, the <code>pNext</code> chain <strong class=\"purple\">must</strong> include a <a href=\"#VkMemoryDedicatedAllocateInfo\">VkMemoryDedicatedAllocateInfo</a> structure with either its <code>image</code> or <code>buffer</code> field set to a value other than <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>."
         },
         {
           "vuid": "VUID-VkMemoryAllocateInfo-image-06384",
@@ -14806,7 +14742,7 @@
         },
         {
           "vuid": "VUID-VkMemoryAllocateInfo-memoryTypeIndex-06386",
-          "text": " If the parameters define an import operation from an <a href=\"#VkBufferCollectionFUCHSIA\">VkBufferCollectionFUCHSIA</a>, <code>memoryTypeIndex</code> <strong class=\"purple\">must</strong> be from <a href=\"#VkBufferCollectionPropertiesFUCHSIA\">VkBufferCollectionPropertiesFUCHSIA</a> as retrieved by <a href=\"#vkGetBufferCollectionPropertiesFUCHSIA\">vkGetBufferCollectionPropertiesFUCHSIA</a>"
+          "text": " If the parameters define an import operation from an <a href=\"#VkBufferCollectionFUCHSIA\">VkBufferCollectionFUCHSIA</a>, <code>memoryTypeIndex</code> <strong class=\"purple\">must</strong> be from <a href=\"#VkBufferCollectionPropertiesFUCHSIA\">VkBufferCollectionPropertiesFUCHSIA</a> as retrieved by <a href=\"#vkGetBufferCollectionPropertiesFUCHSIA\">vkGetBufferCollectionPropertiesFUCHSIA</a>."
         }
       ],
       "(VK_KHR_external_memory)+(VK_KHR_dedicated_allocation,VK_NV_dedicated_allocation)": [
@@ -14908,7 +14844,7 @@
         },
         {
           "vuid": "VUID-VkMemoryAllocateInfo-pNext-02386",
-          "text": " If the parameters define an import operation, the external handle is an Android hardware buffer, and the <code>pNext</code> chain includes a <a href=\"#VkMemoryDedicatedAllocateInfo\">VkMemoryDedicatedAllocateInfo</a> with <code>image</code> that is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, the Android hardware buffer&#8217;s <a href=\"#AHardwareBuffer\">AHardwareBuffer</a>::<code>usage</code> <strong class=\"purple\">must</strong> include at least one of <code>AHARDWAREBUFFER_USAGE_GPU_FRAMEBUFFER</code>, <code>AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE</code> or <code>AHARDWAREBUFFER_USAGE_GPU_DATA_BUFFER</code>"
+          "text": " If the parameters define an import operation, the external handle is an Android hardware buffer, and the <code>pNext</code> chain includes a <a href=\"#VkMemoryDedicatedAllocateInfo\">VkMemoryDedicatedAllocateInfo</a> with <code>image</code> that is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, the Android hardware buffer&#8217;s <code>AHardwareBuffer</code>::<code>usage</code> <strong class=\"purple\">must</strong> include at least one of <code>AHARDWAREBUFFER_USAGE_GPU_FRAMEBUFFER</code>, <code>AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE</code> or <code>AHARDWAREBUFFER_USAGE_GPU_DATA_BUFFER</code>"
         },
         {
           "vuid": "VUID-VkMemoryAllocateInfo-pNext-02387",
@@ -14920,11 +14856,11 @@
         },
         {
           "vuid": "VUID-VkMemoryAllocateInfo-pNext-02389",
-          "text": " If the parameters define an import operation, the external handle is an Android hardware buffer, and the <code>pNext</code> chain includes a <a href=\"#VkMemoryDedicatedAllocateInfo\">VkMemoryDedicatedAllocateInfo</a> structure with <code>image</code> that is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, and the Android hardware buffer&#8217;s <a href=\"#AHardwareBuffer\">AHardwareBuffer</a>::<code>usage</code> includes <code>AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE</code>, the <code>image</code> <strong class=\"purple\">must</strong> have a complete mipmap chain"
+          "text": " If the parameters define an import operation, the external handle is an Android hardware buffer, and the <code>pNext</code> chain includes a <a href=\"#VkMemoryDedicatedAllocateInfo\">VkMemoryDedicatedAllocateInfo</a> structure with <code>image</code> that is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, and the Android hardware buffer&#8217;s <code>AHardwareBuffer</code>::<code>usage</code> includes <code>AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE</code>, the <code>image</code> <strong class=\"purple\">must</strong> have a complete mipmap chain"
         },
         {
           "vuid": "VUID-VkMemoryAllocateInfo-pNext-02586",
-          "text": " If the parameters define an import operation, the external handle is an Android hardware buffer, and the <code>pNext</code> chain includes a <a href=\"#VkMemoryDedicatedAllocateInfo\">VkMemoryDedicatedAllocateInfo</a> structure with <code>image</code> that is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, and the Android hardware buffer&#8217;s <a href=\"#AHardwareBuffer\">AHardwareBuffer</a>::<code>usage</code> does not include <code>AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE</code>, the <code>image</code> <strong class=\"purple\">must</strong> have exactly one mipmap level"
+          "text": " If the parameters define an import operation, the external handle is an Android hardware buffer, and the <code>pNext</code> chain includes a <a href=\"#VkMemoryDedicatedAllocateInfo\">VkMemoryDedicatedAllocateInfo</a> structure with <code>image</code> that is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, and the Android hardware buffer&#8217;s <code>AHardwareBuffer</code>::<code>usage</code> does not include <code>AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE</code>, the <code>image</code> <strong class=\"purple\">must</strong> have exactly one mipmap level"
         },
         {
           "vuid": "VUID-VkMemoryAllocateInfo-pNext-02390",
@@ -14968,7 +14904,7 @@
       "(VK_EXT_metal_objects)": [
         {
           "vuid": "VUID-VkMemoryAllocateInfo-pNext-06780",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure, its <code>exportObjectType</code> member <strong class=\"purple\">must</strong> be <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_BUFFER_BIT_EXT</code>"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure, its <code>exportObjectType</code> member <strong class=\"purple\">must</strong> be <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_BUFFER_BIT_EXT</code>."
         }
       ]
     },
@@ -15590,7 +15526,7 @@
         },
         {
           "vuid": "VUID-VkImportAndroidHardwareBufferInfoANDROID-buffer-parameter",
-          "text": " <code>buffer</code> <strong class=\"purple\">must</strong> be a valid pointer to an <a href=\"#AHardwareBuffer\">AHardwareBuffer</a> value"
+          "text": " <code>buffer</code> <strong class=\"purple\">must</strong> be a valid pointer to an <code>AHardwareBuffer</code> value"
         }
       ]
     },
@@ -15606,7 +15542,7 @@
         },
         {
           "vuid": "VUID-vkGetMemoryAndroidHardwareBufferANDROID-pBuffer-parameter",
-          "text": " <code>pBuffer</code> <strong class=\"purple\">must</strong> be a valid pointer to a valid pointer to an <a href=\"#AHardwareBuffer\">AHardwareBuffer</a> value"
+          "text": " <code>pBuffer</code> <strong class=\"purple\">must</strong> be a valid pointer to a valid pointer to an <code>AHardwareBuffer</code> value"
         }
       ]
     },
@@ -15646,7 +15582,7 @@
         },
         {
           "vuid": "VUID-vkGetAndroidHardwareBufferPropertiesANDROID-buffer-parameter",
-          "text": " <code>buffer</code> <strong class=\"purple\">must</strong> be a valid pointer to a valid <a href=\"#AHardwareBuffer\">AHardwareBuffer</a> value"
+          "text": " <code>buffer</code> <strong class=\"purple\">must</strong> be a valid pointer to a valid <code>AHardwareBuffer</code> value"
         },
         {
           "vuid": "VUID-vkGetAndroidHardwareBufferPropertiesANDROID-pProperties-parameter",
@@ -15698,7 +15634,7 @@
         },
         {
           "vuid": "VUID-vkGetMemoryRemoteAddressNV-pAddress-parameter",
-          "text": " <code>pAddress</code> <strong class=\"purple\">must</strong> be a valid pointer to a <a href=\"#VkRemoteAddressNV\">VkRemoteAddressNV</a> value"
+          "text": " <code>pAddress</code> <strong class=\"purple\">must</strong> be a valid pointer to a <code>VkRemoteAddressNV</code> value"
         }
       ]
     },
@@ -15854,39 +15790,39 @@
       "(VK_EXT_metal_objects)": [
         {
           "vuid": "VUID-VkExportMetalObjectsInfoEXT-pNext-06791",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalDeviceInfoEXT\">VkExportMetalDeviceInfoEXT</a> structure, the <a href=\"#VkInstance\">VkInstance</a> <strong class=\"purple\">must</strong> have been created with <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_DEVICE_BIT_EXT</code> in the <code>exportObjectType</code> member of a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure in the <code>pNext</code> chain of the <a href=\"#VkInstanceCreateInfo\">VkInstanceCreateInfo</a> structure in the <a href=\"#vkCreateInstance\">vkCreateInstance</a> command"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalDeviceInfoEXT\">VkExportMetalDeviceInfoEXT</a> structure, the <a href=\"#VkInstance\">VkInstance</a> <strong class=\"purple\">must</strong> have been created with <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_DEVICE_BIT_EXT</code> in the <code>exportObjectType</code> member of a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure in the <code>pNext</code> chain of the <a href=\"#VkInstanceCreateInfo\">VkInstanceCreateInfo</a> structure in the <a href=\"#vkCreateInstance\">vkCreateInstance</a> command."
         },
         {
           "vuid": "VUID-VkExportMetalObjectsInfoEXT-pNext-06792",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalCommandQueueInfoEXT\">VkExportMetalCommandQueueInfoEXT</a> structure, the <a href=\"#VkInstance\">VkInstance</a> <strong class=\"purple\">must</strong> have been created with <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_COMMAND_QUEUE_BIT_EXT</code> in the <code>exportObjectType</code> member of a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure in the <code>pNext</code> chain of the <a href=\"#VkInstanceCreateInfo\">VkInstanceCreateInfo</a> structure in the <a href=\"#vkCreateInstance\">vkCreateInstance</a> command"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalCommandQueueInfoEXT\">VkExportMetalCommandQueueInfoEXT</a> structure, the <a href=\"#VkInstance\">VkInstance</a> <strong class=\"purple\">must</strong> have been created with <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_COMMAND_QUEUE_BIT_EXT</code> in the <code>exportObjectType</code> member of a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure in the <code>pNext</code> chain of the <a href=\"#VkInstanceCreateInfo\">VkInstanceCreateInfo</a> structure in the <a href=\"#vkCreateInstance\">vkCreateInstance</a> command."
         },
         {
           "vuid": "VUID-VkExportMetalObjectsInfoEXT-pNext-06793",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalBufferInfoEXT\">VkExportMetalBufferInfoEXT</a> structure, the <a href=\"#VkDeviceMemory\">VkDeviceMemory</a> in its <code>memory</code> member <strong class=\"purple\">must</strong> have been allocated with <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_BUFFER_BIT_EXT</code> in the <code>exportObjectType</code> member of a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure in the <code>pNext</code> chain of the <a href=\"#VkMemoryAllocateInfo\">VkMemoryAllocateInfo</a> structure in the <a href=\"#vkAllocateMemory\">vkAllocateMemory</a> command"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalBufferInfoEXT\">VkExportMetalBufferInfoEXT</a> structure, the <a href=\"#VkDeviceMemory\">VkDeviceMemory</a> in its <code>memory</code> member <strong class=\"purple\">must</strong> have been allocated with <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_BUFFER_BIT_EXT</code> in the <code>exportObjectType</code> member of a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure in the <code>pNext</code> chain of the <a href=\"#VkMemoryAllocateInfo\">VkMemoryAllocateInfo</a> structure in the <a href=\"#vkAllocateMemory\">vkAllocateMemory</a> command."
         },
         {
           "vuid": "VUID-VkExportMetalObjectsInfoEXT-pNext-06794",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalTextureInfoEXT\">VkExportMetalTextureInfoEXT</a> structure, exactly one of its <code>image</code>, <code>imageView</code>, or <code>bufferView</code> members <strong class=\"purple\">must</strong> not be <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalTextureInfoEXT\">VkExportMetalTextureInfoEXT</a> structure, exactly one of its <code>image</code>, <code>imageView</code>, or <code>bufferView</code> members <strong class=\"purple\">must</strong> not be <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>."
         },
         {
           "vuid": "VUID-VkExportMetalObjectsInfoEXT-pNext-06795",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalTextureInfoEXT\">VkExportMetalTextureInfoEXT</a> structure, and its <code>image</code> member is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, the <a href=\"#VkImage\">VkImage</a> in its <code>image</code> member <strong class=\"purple\">must</strong> have been created with <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_TEXTURE_BIT_EXT</code> in the <code>exportObjectType</code> member of a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure in the <code>pNext</code> chain of the <a href=\"#VkImageCreateInfo\">VkImageCreateInfo</a> structure in the <a href=\"#vkCreateImage\">vkCreateImage</a> command"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalTextureInfoEXT\">VkExportMetalTextureInfoEXT</a> structure, and its <code>image</code> member is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, the <a href=\"#VkImage\">VkImage</a> in its <code>image</code> member <strong class=\"purple\">must</strong> have been created with <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_TEXTURE_BIT_EXT</code> in the <code>exportObjectType</code> member of a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure in the <code>pNext</code> chain of the <a href=\"#VkImageCreateInfo\">VkImageCreateInfo</a> structure in the <a href=\"#vkCreateImage\">vkCreateImage</a> command."
         },
         {
           "vuid": "VUID-VkExportMetalObjectsInfoEXT-pNext-06796",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalTextureInfoEXT\">VkExportMetalTextureInfoEXT</a> structure, and its <code>imageView</code> member is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, the <a href=\"#VkImageView\">VkImageView</a> in its <code>imageView</code> member <strong class=\"purple\">must</strong> have been created with <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_TEXTURE_BIT_EXT</code> in the <code>exportObjectType</code> member of a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure in the <code>pNext</code> chain of the <a href=\"#VkImageViewCreateInfo\">VkImageViewCreateInfo</a> structure in the <a href=\"#vkCreateImageView\">vkCreateImageView</a> command"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalTextureInfoEXT\">VkExportMetalTextureInfoEXT</a> structure, and its <code>imageView</code> member is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, the <a href=\"#VkImageView\">VkImageView</a> in its <code>imageView</code> member <strong class=\"purple\">must</strong> have been created with <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_TEXTURE_BIT_EXT</code> in the <code>exportObjectType</code> member of a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure in the <code>pNext</code> chain of the <a href=\"#VkImageViewCreateInfo\">VkImageViewCreateInfo</a> structure in the <a href=\"#vkCreateImageView\">vkCreateImageView</a> command."
         },
         {
           "vuid": "VUID-VkExportMetalObjectsInfoEXT-pNext-06797",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalTextureInfoEXT\">VkExportMetalTextureInfoEXT</a> structure, and its <code>bufferView</code> member is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, the <a href=\"#VkBufferView\">VkBufferView</a> in its <code>bufferView</code> member <strong class=\"purple\">must</strong> have been created with <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_TEXTURE_BIT_EXT</code> in the <code>exportObjectType</code> member of a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure in the <code>pNext</code> chain of the <a href=\"#VkBufferViewCreateInfo\">VkBufferViewCreateInfo</a> structure in the <a href=\"#vkCreateBufferView\">vkCreateBufferView</a> command"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalTextureInfoEXT\">VkExportMetalTextureInfoEXT</a> structure, and its <code>bufferView</code> member is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, the <a href=\"#VkBufferView\">VkBufferView</a> in its <code>bufferView</code> member <strong class=\"purple\">must</strong> have been created with <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_TEXTURE_BIT_EXT</code> in the <code>exportObjectType</code> member of a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure in the <code>pNext</code> chain of the <a href=\"#VkBufferViewCreateInfo\">VkBufferViewCreateInfo</a> structure in the <a href=\"#vkCreateBufferView\">vkCreateBufferView</a> command."
         },
         {
           "vuid": "VUID-VkExportMetalObjectsInfoEXT-pNext-06798",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalTextureInfoEXT\">VkExportMetalTextureInfoEXT</a> structure, and if either its <code>image</code> or <code>imageView</code> member is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, then <code>plane</code> <strong class=\"purple\">must</strong> be <code>VK_IMAGE_ASPECT_PLANE_0_BIT</code>, <code>VK_IMAGE_ASPECT_PLANE_1_BIT</code>, or <code>VK_IMAGE_ASPECT_PLANE_2_BIT</code>"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalTextureInfoEXT\">VkExportMetalTextureInfoEXT</a> structure, and if either its <code>image</code> or <code>imageView</code> member is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, then <code>plane</code> <strong class=\"purple\">must</strong> be <code>VK_IMAGE_ASPECT_PLANE_0_BIT</code>, <code>VK_IMAGE_ASPECT_PLANE_1_BIT</code>, or <code>VK_IMAGE_ASPECT_PLANE_2_BIT</code>."
         },
         {
           "vuid": "VUID-VkExportMetalObjectsInfoEXT-pNext-06799",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalTextureInfoEXT\">VkExportMetalTextureInfoEXT</a> structure, and if the <a href=\"#VkImage\">VkImage</a> in its <code>image</code> member does not have a multi-planar format, then its <code>plane</code> member <strong class=\"purple\">must</strong> be <code>VK_IMAGE_ASPECT_PLANE_0_BIT</code>"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalTextureInfoEXT\">VkExportMetalTextureInfoEXT</a> structure, and if the <a href=\"#VkImage\">VkImage</a> in its <code>image</code> member does not have a multi-planar format, then its <code>plane</code> member <strong class=\"purple\">must</strong> be <code>VK_IMAGE_ASPECT_PLANE_0_BIT</code>."
         },
         {
           "vuid": "VUID-VkExportMetalObjectsInfoEXT-pNext-06800",
@@ -15894,7 +15830,7 @@
         },
         {
           "vuid": "VUID-VkExportMetalObjectsInfoEXT-pNext-06801",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalTextureInfoEXT\">VkExportMetalTextureInfoEXT</a> structure, and if the <a href=\"#VkImageView\">VkImageView</a> in its <code>imageView</code> member does not have a multi-planar format, then its <code>plane</code> member <strong class=\"purple\">must</strong> be <code>VK_IMAGE_ASPECT_PLANE_0_BIT</code>"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalTextureInfoEXT\">VkExportMetalTextureInfoEXT</a> structure, and if the <a href=\"#VkImageView\">VkImageView</a> in its <code>imageView</code> member does not have a multi-planar format, then its <code>plane</code> member <strong class=\"purple\">must</strong> be <code>VK_IMAGE_ASPECT_PLANE_0_BIT</code>."
         },
         {
           "vuid": "VUID-VkExportMetalObjectsInfoEXT-pNext-06802",
@@ -15902,19 +15838,19 @@
         },
         {
           "vuid": "VUID-VkExportMetalObjectsInfoEXT-pNext-06803",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalIOSurfaceInfoEXT\">VkExportMetalIOSurfaceInfoEXT</a> structure, the <a href=\"#VkImage\">VkImage</a> in its <code>image</code> member <strong class=\"purple\">must</strong> have been created with <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_IOSURFACE_BIT_EXT</code> in the <code>exportObjectType</code> member of a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure in the <code>pNext</code> chain of the <a href=\"#VkImageCreateInfo\">VkImageCreateInfo</a> structure in the <a href=\"#vkCreateImage\">vkCreateImage</a> command"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalIOSurfaceInfoEXT\">VkExportMetalIOSurfaceInfoEXT</a> structure, the <a href=\"#VkImage\">VkImage</a> in its <code>image</code> member <strong class=\"purple\">must</strong> have been created with <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_IOSURFACE_BIT_EXT</code> in the <code>exportObjectType</code> member of a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure in the <code>pNext</code> chain of the <a href=\"#VkImageCreateInfo\">VkImageCreateInfo</a> structure in the <a href=\"#vkCreateImage\">vkCreateImage</a> command."
         },
         {
           "vuid": "VUID-VkExportMetalObjectsInfoEXT-pNext-06804",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalSharedEventInfoEXT\">VkExportMetalSharedEventInfoEXT</a> structure, exactly one of its <code>semaphore</code> or <code>event</code> members <strong class=\"purple\">must</strong> not be <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalSharedEventInfoEXT\">VkExportMetalSharedEventInfoEXT</a> structure, exactly one of its <code>semaphore</code> or <code>event</code> members <strong class=\"purple\">must</strong> not be <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>."
         },
         {
           "vuid": "VUID-VkExportMetalObjectsInfoEXT-pNext-06805",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalSharedEventInfoEXT\">VkExportMetalSharedEventInfoEXT</a> structure, and its <code>semaphore</code> member is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, the <a href=\"#VkSemaphore\">VkSemaphore</a> in its <code>semaphore</code> member <strong class=\"purple\">must</strong> have been created with <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_SHARED_EVENT_BIT_EXT</code> in the <code>exportObjectType</code> member of a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure in the <code>pNext</code> chain of the <a href=\"#VkSemaphoreCreateInfo\">VkSemaphoreCreateInfo</a> structure in the <a href=\"#vkCreateSemaphore\">vkCreateSemaphore</a> command"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalSharedEventInfoEXT\">VkExportMetalSharedEventInfoEXT</a> structure, and its <code>semaphore</code> member is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, the <a href=\"#VkSemaphore\">VkSemaphore</a> in its <code>semaphore</code> member <strong class=\"purple\">must</strong> have been created with <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_SHARED_EVENT_BIT_EXT</code> in the <code>exportObjectType</code> member of a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure in the <code>pNext</code> chain of the <a href=\"#VkSemaphoreCreateInfo\">VkSemaphoreCreateInfo</a> structure in the <a href=\"#vkCreateSemaphore\">vkCreateSemaphore</a> command."
         },
         {
           "vuid": "VUID-VkExportMetalObjectsInfoEXT-pNext-06806",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalSharedEventInfoEXT\">VkExportMetalSharedEventInfoEXT</a> structure, and its <code>event</code> member is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, the <a href=\"#VkEvent\">VkEvent</a> in its <code>event</code> member <strong class=\"purple\">must</strong> have been created with <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_SHARED_EVENT_BIT_EXT</code> in the <code>exportObjectType</code> member of a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure in the <code>pNext</code> chain of the <a href=\"#VkEventCreateInfo\">VkEventCreateInfo</a> structure in the <a href=\"#vkCreateEvent\">vkCreateEvent</a> command"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalSharedEventInfoEXT\">VkExportMetalSharedEventInfoEXT</a> structure, and its <code>event</code> member is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, the <a href=\"#VkEvent\">VkEvent</a> in its <code>event</code> member <strong class=\"purple\">must</strong> have been created with <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_SHARED_EVENT_BIT_EXT</code> in the <code>exportObjectType</code> member of a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure in the <code>pNext</code> chain of the <a href=\"#VkEventCreateInfo\">VkEventCreateInfo</a> structure in the <a href=\"#vkCreateEvent\">vkCreateEvent</a> command."
         },
         {
           "vuid": "VUID-VkExportMetalObjectsInfoEXT-sType-sType",
@@ -16268,7 +16204,7 @@
         },
         {
           "vuid": "VUID-vkGetDeviceMemoryCommitment-pCommittedMemoryInBytes-parameter",
-          "text": " <code>pCommittedMemoryInBytes</code> <strong class=\"purple\">must</strong> be a valid pointer to a <a href=\"#VkDeviceSize\">VkDeviceSize</a> value"
+          "text": " <code>pCommittedMemoryInBytes</code> <strong class=\"purple\">must</strong> be a valid pointer to a <code>VkDeviceSize</code> value"
         },
         {
           "vuid": "VUID-vkGetDeviceMemoryCommitment-memory-parent",
@@ -16518,7 +16454,7 @@
         },
         {
           "vuid": "VUID-VkBufferCreateInfo-flags-08099",
-          "text": " If <code>flags</code> includes <code>VK_BUFFER_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT</code>, the <a href=\"#features-descriptorBufferCaptureReplay\"><code>descriptorBufferCaptureReplay</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " If <code>flags</code> includes <code>VK_BUFFER_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT</code>, the <a href=\"#features-descriptorBufferCaptureReplay\">descriptorBufferCaptureReplay</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-VkBufferCreateInfo-pNext-08100",
@@ -16526,7 +16462,7 @@
         },
         {
           "vuid": "VUID-VkBufferCreateInfo-usage-08101",
-          "text": " If <code>usage</code> includes <code>VK_BUFFER_USAGE_PUSH_DESCRIPTORS_DESCRIPTOR_BUFFER_BIT_EXT</code>, the <a href=\"#features-descriptorBufferPushDescriptors\"><code>descriptorBufferPushDescriptors</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " If <code>usage</code> includes <code>VK_BUFFER_USAGE_PUSH_DESCRIPTORS_DESCRIPTOR_BUFFER_BIT_EXT</code>, the <a href=\"#features-descriptorBufferPushDescriptors\">descriptorBufferPushDescriptors</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-VkBufferCreateInfo-usage-08102",
@@ -16732,7 +16668,7 @@
       "(VK_EXT_metal_objects)": [
         {
           "vuid": "VUID-VkBufferViewCreateInfo-pNext-06782",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure, its <code>exportObjectType</code> member <strong class=\"purple\">must</strong> be <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_TEXTURE_BIT_EXT</code>"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure, its <code>exportObjectType</code> member <strong class=\"purple\">must</strong> be <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_TEXTURE_BIT_EXT</code>."
         }
       ]
     },
@@ -17320,17 +17256,17 @@
       "(VK_FUCHSIA_buffer_collection)": [
         {
           "vuid": "VUID-VkImageCreateInfo-pNext-06390",
-          "text": " If the <a href=\"#VkImage\">VkImage</a> is to be used to import memory from a <a href=\"#VkBufferCollectionFUCHSIA\">VkBufferCollectionFUCHSIA</a>, a <a href=\"#VkBufferCollectionImageCreateInfoFUCHSIA\">VkBufferCollectionImageCreateInfoFUCHSIA</a> structure <strong class=\"purple\">must</strong> be chained to <code>pNext</code>"
+          "text": " If the <a href=\"#VkImage\">VkImage</a> is to be used to import memory from a <a href=\"#VkBufferCollectionFUCHSIA\">VkBufferCollectionFUCHSIA</a>, a <a href=\"#VkBufferCollectionImageCreateInfoFUCHSIA\">VkBufferCollectionImageCreateInfoFUCHSIA</a> structure <strong class=\"purple\">must</strong> be chained to <code>pNext</code>."
         }
       ],
       "(VK_EXT_multisampled_render_to_single_sampled)": [
         {
           "vuid": "VUID-VkImageCreateInfo-multisampledRenderToSingleSampled-06882",
-          "text": " If the <a href=\"#features-multisampledRenderToSingleSampled\"><code>multisampledRenderToSingleSampled</code></a> feature is not enabled, <code>flags</code> <strong class=\"purple\">must</strong> not contain <code>VK_IMAGE_CREATE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_BIT_EXT</code>"
+          "text": " If the <a href=\"#features-multisampledRenderToSingleSampled\"><code>multisampledRenderToSingleSampled</code></a> feature is not enabled, <code>flags</code> <strong class=\"purple\">must</strong> not contain <code>VK_IMAGE_CREATE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_BIT_EXT</code>."
         },
         {
           "vuid": "VUID-VkImageCreateInfo-flags-06883",
-          "text": " If <code>flags</code> contains <code>VK_IMAGE_CREATE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_BIT_EXT</code>, <code>samples</code> <strong class=\"purple\">must</strong> be <code>VK_SAMPLE_COUNT_1_BIT</code>"
+          "text": " If <code>flags</code> contains <code>VK_IMAGE_CREATE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_BIT_EXT</code>, <code>samples</code> <strong class=\"purple\">must</strong> be <code>VK_SAMPLE_COUNT_1_BIT</code>."
         }
       ],
       "(VK_EXT_image_compression_control)+(VK_VERSION_1_1,VK_KHR_sampler_ycbcr_conversion)": [
@@ -17358,7 +17294,7 @@
       "(VK_EXT_descriptor_buffer)": [
         {
           "vuid": "VUID-VkImageCreateInfo-flags-08104",
-          "text": " If <code>flags</code> includes <code>VK_IMAGE_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT</code>, the <a href=\"#features-descriptorBufferCaptureReplay\"><code>descriptorBufferCaptureReplay</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " If <code>flags</code> includes <code>VK_IMAGE_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT</code>, the <a href=\"#features-descriptorBufferCaptureReplay\">descriptorBufferCaptureReplay</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-VkImageCreateInfo-pNext-08105",
@@ -17368,19 +17304,19 @@
       "(VK_EXT_metal_objects)": [
         {
           "vuid": "VUID-VkImageCreateInfo-pNext-06783",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure, its <code>exportObjectType</code> member <strong class=\"purple\">must</strong> be either <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_TEXTURE_BIT_EXT</code> or <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_IOSURFACE_BIT_EXT</code>"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure, its <code>exportObjectType</code> member <strong class=\"purple\">must</strong> be either <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_TEXTURE_BIT_EXT</code> or <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_IOSURFACE_BIT_EXT</code>."
         },
         {
           "vuid": "VUID-VkImageCreateInfo-pNext-06784",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkImportMetalTextureInfoEXT\">VkImportMetalTextureInfoEXT</a> structure its <code>plane</code> member <strong class=\"purple\">must</strong> be <code>VK_IMAGE_ASPECT_PLANE_0_BIT</code>, <code>VK_IMAGE_ASPECT_PLANE_1_BIT</code>, or <code>VK_IMAGE_ASPECT_PLANE_2_BIT</code>"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkImportMetalTextureInfoEXT\">VkImportMetalTextureInfoEXT</a> structure its <code>plane</code> member <strong class=\"purple\">must</strong> be <code>VK_IMAGE_ASPECT_PLANE_0_BIT</code>, <code>VK_IMAGE_ASPECT_PLANE_1_BIT</code>, or <code>VK_IMAGE_ASPECT_PLANE_2_BIT</code>."
         },
         {
           "vuid": "VUID-VkImageCreateInfo-pNext-06785",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkImportMetalTextureInfoEXT\">VkImportMetalTextureInfoEXT</a> structure and the image does not have a multi-planar format, then <a href=\"#VkImportMetalTextureInfoEXT\">VkImportMetalTextureInfoEXT</a>::<code>plane</code> <strong class=\"purple\">must</strong> be <code>VK_IMAGE_ASPECT_PLANE_0_BIT</code>"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkImportMetalTextureInfoEXT\">VkImportMetalTextureInfoEXT</a> structure and the image does not have a multi-planar format, then <a href=\"#VkImportMetalTextureInfoEXT\">VkImportMetalTextureInfoEXT</a>::<code>plane</code> <strong class=\"purple\">must</strong> be <code>VK_IMAGE_ASPECT_PLANE_0_BIT</code>."
         },
         {
           "vuid": "VUID-VkImageCreateInfo-pNext-06786",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkImportMetalTextureInfoEXT\">VkImportMetalTextureInfoEXT</a> structure and the image has a multi-planar format with only two planes, then <a href=\"#VkImportMetalTextureInfoEXT\">VkImportMetalTextureInfoEXT</a>::<code>plane</code> <strong class=\"purple\">must</strong> not be <code>VK_IMAGE_ASPECT_PLANE_2_BIT</code>"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkImportMetalTextureInfoEXT\">VkImportMetalTextureInfoEXT</a> structure and the image has a multi-planar format with only two planes, then <a href=\"#VkImportMetalTextureInfoEXT\">VkImportMetalTextureInfoEXT</a>::<code>plane</code> <strong class=\"purple\">must</strong> not be <code>VK_IMAGE_ASPECT_PLANE_2_BIT</code>."
         }
       ]
     },
@@ -18258,7 +18194,7 @@
       "(VK_EXT_descriptor_buffer)": [
         {
           "vuid": "VUID-VkImageViewCreateInfo-flags-08106",
-          "text": " If <code>flags</code> includes <code>VK_IMAGE_VIEW_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT</code>, the <a href=\"#features-descriptorBufferCaptureReplay\"><code>descriptorBufferCaptureReplay</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " If <code>flags</code> includes <code>VK_IMAGE_VIEW_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT</code>, the <a href=\"#features-descriptorBufferCaptureReplay\">descriptorBufferCaptureReplay</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-VkImageViewCreateInfo-pNext-08107",
@@ -18268,7 +18204,7 @@
       "(VK_EXT_metal_objects)": [
         {
           "vuid": "VUID-VkImageViewCreateInfo-pNext-06787",
-          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure, its <code>exportObjectType</code> member <strong class=\"purple\">must</strong> be <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_TEXTURE_BIT_EXT</code>"
+          "text": " If the <code>pNext</code> chain includes a <a href=\"#VkExportMetalObjectCreateInfoEXT\">VkExportMetalObjectCreateInfoEXT</a> structure, its <code>exportObjectType</code> member <strong class=\"purple\">must</strong> be <code>VK_EXPORT_METAL_OBJECT_TYPE_METAL_TEXTURE_BIT_EXT</code>."
         }
       ],
       "(VK_QCOM_image_processing)": [
@@ -18302,7 +18238,7 @@
         },
         {
           "vuid": "VUID-VkImageViewCreateInfo-pNext-06951",
-          "text": " If the <code>pNext</code> chain includes <a href=\"#VkImageViewSampleWeightCreateInfoQCOM\">VkImageViewSampleWeightCreateInfoQCOM</a> structure and <code>viewType</code> is <code>VK_IMAGE_VIEW_TYPE_1D_ARRAY</code>, then <code>subresourceRange.layerCount</code> <strong class=\"purple\">must</strong> be equal to <code>2</code>"
+          "text": " If the <code>pNext</code> chain includes <a href=\"#VkImageViewSampleWeightCreateInfoQCOM\">VkImageViewSampleWeightCreateInfoQCOM</a> structure and <code>viewType</code> is <code>VK_IMAGE_VIEW_TYPE_1D_ARRAY</code>, then <code>subresourceRange.layerCount</code> <strong class=\"purple\">must</strong> be equal to <code>2</code>."
         },
         {
           "vuid": "VUID-VkImageViewCreateInfo-pNext-06952",
@@ -18582,11 +18518,11 @@
       "(VK_EXT_image_view_min_lod)": [
         {
           "vuid": "VUID-VkImageViewMinLodCreateInfoEXT-minLod-06455",
-          "text": " If the <a href=\"#features-minLod\"><code>minLod</code></a> feature is not enabled, <code>minLod</code> <strong class=\"purple\">must</strong> be <code>0.0</code>"
+          "text": " If the <a href=\"#features-minLod\"><code>minLod</code></a> feature is not enabled, <code>minLod</code> <strong class=\"purple\">must</strong> be <code>0.0</code>."
         },
         {
           "vuid": "VUID-VkImageViewMinLodCreateInfoEXT-minLod-06456",
-          "text": " <code>minLod</code> <strong class=\"purple\">must</strong> be less or equal to the index of the last mipmap level accessible to the view"
+          "text": " <code>minLod</code> <strong class=\"purple\">must</strong> be less or equal to the index of the last mipmap level accessible to the view."
         },
         {
           "vuid": "VUID-VkImageViewMinLodCreateInfoEXT-sType-sType",
@@ -18800,7 +18736,7 @@
       "(VK_NV_ray_tracing,VK_KHR_acceleration_structure)+(VK_KHR_acceleration_structure)+(VK_EXT_descriptor_buffer)": [
         {
           "vuid": "VUID-VkAccelerationStructureCreateInfoKHR-createFlags-08108",
-          "text": " If <code>createFlags</code> includes <code>VK_ACCELERATION_STRUCTURE_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT</code>, the <a href=\"#features-descriptorBufferCaptureReplay\"><code>descriptorBufferCaptureReplay</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " If <code>createFlags</code> includes <code>VK_ACCELERATION_STRUCTURE_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT</code>, the <a href=\"#features-descriptorBufferCaptureReplay\">descriptorBufferCaptureReplay</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-VkAccelerationStructureCreateInfoKHR-pNext-08109",
@@ -19264,7 +19200,7 @@
         },
         {
           "vuid": "VUID-vkCreateMicromapEXT-device-07432",
-          "text": " If <code>device</code> was created with multiple physical devices, then the <a href=\"#features-bufferDeviceAddressMultiDevice\"><code>bufferDeviceAddressMultiDevice</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " If <code>device</code> was created with multiple physical devices, then the <a href=\"#features-bufferDeviceAddressMultiDevice\">bufferDeviceAddressMultiDevice</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-vkCreateMicromapEXT-device-parameter",
@@ -19340,7 +19276,7 @@
         },
         {
           "vuid": "VUID-vkGetMicromapBuildSizesEXT-device-07440",
-          "text": " If <code>device</code> was created with multiple physical devices, then the <a href=\"#features-bufferDeviceAddressMultiDevice\"><code>bufferDeviceAddressMultiDevice</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " If <code>device</code> was created with multiple physical devices, then the <a href=\"#features-bufferDeviceAddressMultiDevice\">bufferDeviceAddressMultiDevice</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-vkGetMicromapBuildSizesEXT-device-parameter",
@@ -19648,7 +19584,7 @@
       "(VK_VERSION_1_1,VK_KHR_get_memory_requirements2)+(VK_VERSION_1_3,VK_KHR_maintenance4)+(VK_ANDROID_external_memory_android_hardware_buffer)+(VK_VERSION_1_3,VK_KHR_maintenance4)": [
         {
           "vuid": "VUID-VkDeviceImageMemoryRequirements-pNext-06996",
-          "text": " Applications also <strong class=\"purple\">must</strong> not call <a href=\"#vkGetDeviceImageMemoryRequirements\">vkGetDeviceImageMemoryRequirements</a> with a <a href=\"#VkImageCreateInfo\">VkImageCreateInfo</a> whose <code>pNext</code> chain includes a <a href=\"#VkExternalFormatANDROID\">VkExternalFormatANDROID</a> structure with non-zero <code>externalFormat</code>"
+          "text": " Applications also <strong class=\"purple\">must</strong> not call <a href=\"#vkGetDeviceImageMemoryRequirements\">vkGetDeviceImageMemoryRequirements</a> with a <a href=\"#VkImageCreateInfo\">VkImageCreateInfo</a> whose <code>pNext</code> chain includes a <a href=\"#VkExternalFormatANDROID\">VkExternalFormatANDROID</a> structure with non-zero <code>externalFormat</code>."
         }
       ]
     },
@@ -20281,10 +20217,6 @@
           "text": " If the <code>pNext</code> chain includes a <a href=\"#VkBindImagePlaneMemoryInfo\">VkBindImagePlaneMemoryInfo</a> structure, <code>image</code> <strong class=\"purple\">must</strong> have been created with the <code>VK_IMAGE_CREATE_DISJOINT_BIT</code> bit set"
         },
         {
-          "vuid": "VUID-VkBindImageMemoryInfo-image-07736",
-          "text": " If <code>image</code> was created with the <code>VK_IMAGE_CREATE_DISJOINT_BIT</code> bit set, then the <code>pNext</code> chain <strong class=\"purple\">must</strong> include a <a href=\"#VkBindImagePlaneMemoryInfo\">VkBindImagePlaneMemoryInfo</a> structure"
-        },
-        {
           "vuid": "VUID-VkBindImageMemoryInfo-pNext-01619",
           "text": " If the <code>pNext</code> chain includes a <a href=\"#VkBindImagePlaneMemoryInfo\">VkBindImagePlaneMemoryInfo</a> structure, <code>memory</code> <strong class=\"purple\">must</strong> have been allocated using one of the memory types allowed in the <code>memoryTypeBits</code> member of the <a href=\"#VkMemoryRequirements\">VkMemoryRequirements</a> structure returned from a call to <a href=\"#vkGetImageMemoryRequirements2\">vkGetImageMemoryRequirements2</a> with <code>image</code> and where <a href=\"#VkBindImagePlaneMemoryInfo\">VkBindImagePlaneMemoryInfo</a>::<code>planeAspect</code> corresponds to the <a href=\"#VkImagePlaneMemoryRequirementsInfo\">VkImagePlaneMemoryRequirementsInfo</a>::<code>planeAspect</code> in the <a href=\"#VkImageMemoryRequirementsInfo2\">VkImageMemoryRequirementsInfo2</a> structure&#8217;s <code>pNext</code> chain"
         },
@@ -20664,7 +20596,7 @@
       "(VK_FUCHSIA_buffer_collection)": [
         {
           "vuid": "VUID-vkGetBufferCollectionPropertiesFUCHSIA-None-06405",
-          "text": " Prior to calling <a href=\"#vkGetBufferCollectionPropertiesFUCHSIA\">vkGetBufferCollectionPropertiesFUCHSIA</a>, the constraints on the buffer collection <strong class=\"purple\">must</strong> have been set by either <a href=\"#vkSetBufferCollectionImageConstraintsFUCHSIA\">vkSetBufferCollectionImageConstraintsFUCHSIA</a> or <a href=\"#vkSetBufferCollectionBufferConstraintsFUCHSIA\">vkSetBufferCollectionBufferConstraintsFUCHSIA</a>"
+          "text": " Prior to calling <a href=\"#vkGetBufferCollectionPropertiesFUCHSIA\">vkGetBufferCollectionPropertiesFUCHSIA</a>, the constraints on the buffer collection <strong class=\"purple\">must</strong> have been set by either <a href=\"#vkSetBufferCollectionImageConstraintsFUCHSIA\">vkSetBufferCollectionImageConstraintsFUCHSIA</a> or <a href=\"#vkSetBufferCollectionBufferConstraintsFUCHSIA\">vkSetBufferCollectionBufferConstraintsFUCHSIA</a>."
         },
         {
           "vuid": "VUID-vkGetBufferCollectionPropertiesFUCHSIA-device-parameter",
@@ -20748,7 +20680,7 @@
       "(VK_FUCHSIA_buffer_collection)": [
         {
           "vuid": "VUID-vkDestroyBufferCollectionFUCHSIA-collection-06407",
-          "text": " <a href=\"#VkImage\">VkImage</a> and <a href=\"#VkBuffer\">VkBuffer</a> objects that referenced <code>collection</code> upon creation by inclusion of a <a href=\"#VkBufferCollectionImageCreateInfoFUCHSIA\">VkBufferCollectionImageCreateInfoFUCHSIA</a> or <a href=\"#VkBufferCollectionBufferCreateInfoFUCHSIA\">VkBufferCollectionBufferCreateInfoFUCHSIA</a> chained to their <a href=\"#VkImageCreateInfo\">VkImageCreateInfo</a> or <a href=\"#VkBufferCreateInfo\">VkBufferCreateInfo</a> structures respectively, <strong class=\"purple\">may</strong> outlive <code>collection</code>"
+          "text": " <a href=\"#VkImage\">VkImage</a> and <a href=\"#VkBuffer\">VkBuffer</a> objects that referenced <code>collection</code> upon creation by inclusion of a <a href=\"#VkBufferCollectionImageCreateInfoFUCHSIA\">VkBufferCollectionImageCreateInfoFUCHSIA</a> or <a href=\"#VkBufferCollectionBufferCreateInfoFUCHSIA\">VkBufferCollectionBufferCreateInfoFUCHSIA</a> chained to their <a href=\"#VkImageCreateInfo\">VkImageCreateInfo</a> or <a href=\"#VkBufferCreateInfo\">VkBufferCreateInfo</a> structures respectively, <strong class=\"purple\">may</strong> outlive <code>collection</code>."
         },
         {
           "vuid": "VUID-vkDestroyBufferCollectionFUCHSIA-device-parameter",
@@ -20990,7 +20922,7 @@
       "(VK_EXT_descriptor_buffer)": [
         {
           "vuid": "VUID-VkSamplerCreateInfo-flags-08110",
-          "text": " If <code>flags</code> includes <code>VK_SAMPLER_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT</code>, the <a href=\"#features-descriptorBufferCaptureReplay\"><code>descriptorBufferCaptureReplay</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " If <code>flags</code> includes <code>VK_SAMPLER_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT</code>, the <a href=\"#features-descriptorBufferCaptureReplay\">descriptorBufferCaptureReplay</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-VkSamplerCreateInfo-pNext-08111",
@@ -21000,7 +20932,7 @@
       "(VK_QCOM_image_processing)": [
         {
           "vuid": "VUID-VkSamplerCreateInfo-flags-06964",
-          "text": " If <code>flags</code> includes <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>, then <code>minFilter</code> and <code>magFilter</code> <strong class=\"purple\">must</strong> be <code>VK_FILTER_NEAREST</code>"
+          "text": " If <code>flags</code> includes <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>, then <code>minFilter</code> and <code>magFilter</code> <strong class=\"purple\">must</strong> be <code>VK_FILTER_NEAREST</code>."
         },
         {
           "vuid": "VUID-VkSamplerCreateInfo-flags-06965",
@@ -21016,7 +20948,7 @@
         },
         {
           "vuid": "VUID-VkSamplerCreateInfo-flags-06968",
-          "text": " If <code>flags</code> includes <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>, and if <code>addressModeU</code> or <code>addressModeV</code> is <code>VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER</code>, then <code>borderColor</code> <strong class=\"purple\">must</strong> be <code>VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK</code>"
+          "text": " If <code>flags</code> includes <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>, and if <code>addressModeU</code> or <code>addressModeV</code> is <code>VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER</code>, then <code>borderColor</code> <strong class=\"purple\">must</strong> be <code>VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK</code>."
         },
         {
           "vuid": "VUID-VkSamplerCreateInfo-flags-06969",
@@ -21264,7 +21196,7 @@
       "(VK_EXT_border_color_swizzle)": [
         {
           "vuid": "VUID-VkSamplerBorderColorComponentMappingCreateInfoEXT-borderColorSwizzle-06437",
-          "text": " The <a href=\"#features-borderColorSwizzle\"><code>borderColorSwizzle</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " The <a href=\"#features-borderColorSwizzle\"><code>borderColorSwizzle</code></a> feature <strong class=\"purple\">must</strong> be enabled."
         },
         {
           "vuid": "VUID-VkSamplerBorderColorComponentMappingCreateInfoEXT-sType-sType",
@@ -21368,7 +21300,7 @@
       "(VK_EXT_mutable_descriptor_type,VK_VALVE_mutable_descriptor_type)": [
         {
           "vuid": "VUID-VkDescriptorSetLayoutCreateInfo-pBindings-07303",
-          "text": " If any element <code>pBindings</code>[i] has a <code>descriptorType</code> of <code>VK_DESCRIPTOR_TYPE_MUTABLE_EXT</code>, then a <a href=\"#VkMutableDescriptorTypeCreateInfoEXT\">VkMutableDescriptorTypeCreateInfoEXT</a> <strong class=\"purple\">must</strong> be present in the <code>pNext</code> chain, and <code>mutableDescriptorTypeListCount</code> <strong class=\"purple\">must</strong> be greater than i"
+          "text": " If any element <code>pBindings</code>[i] has a <code>descriptorType</code> of <code>VK_DESCRIPTOR_TYPE_MUTABLE_EXT</code>, then a <a href=\"#VkMutableDescriptorTypeCreateInfoEXT\">VkMutableDescriptorTypeCreateInfoEXT</a> <strong class=\"purple\">must</strong> be present in the <code>pNext</code> chain, and <code>mutableDescriptorTypeListCount</code> <strong class=\"purple\">must</strong> be greater than i."
         },
         {
           "vuid": "VUID-VkDescriptorSetLayoutCreateInfo-descriptorType-04594",
@@ -22539,10 +22471,6 @@
           "text": " If <code>descriptorType</code> is <code>VK_DESCRIPTOR_TYPE_STORAGE_IMAGE</code> or <code>VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT</code>, the <code>imageView</code> member of each element of <code>pImageInfo</code> <strong class=\"purple\">must</strong> have been created with the identity swizzle"
         },
         {
-          "vuid": "VUID-VkWriteDescriptorSet-descriptorType-07729",
-          "text": " If <code>descriptorType</code> is <code>VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT</code>, the <code>imageView</code> member of each element of <code>pImageInfo</code> <strong class=\"purple\">must</strong> have been created with exactly one aspect"
-        },
-        {
           "vuid": "VUID-VkWriteDescriptorSet-descriptorType-00337",
           "text": " If <code>descriptorType</code> is <code>VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE</code> or <code>VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER</code>, the <code>imageView</code> member of each element of <code>pImageInfo</code> <strong class=\"purple\">must</strong> have been created with <code>VK_IMAGE_USAGE_SAMPLED_BIT</code> set"
         },
@@ -23452,7 +23380,7 @@
       "(VK_EXT_descriptor_buffer)": [
         {
           "vuid": "VUID-vkGetDescriptorSetLayoutSizeEXT-None-08011",
-          "text": " The <a href=\"#features-descriptorBuffer\"><code>descriptorBuffer</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " The <a href=\"#features-descriptorBuffer\">descriptorBuffer</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-vkGetDescriptorSetLayoutSizeEXT-layout-08012",
@@ -23468,7 +23396,7 @@
         },
         {
           "vuid": "VUID-vkGetDescriptorSetLayoutSizeEXT-pLayoutSizeInBytes-parameter",
-          "text": " <code>pLayoutSizeInBytes</code> <strong class=\"purple\">must</strong> be a valid pointer to a <a href=\"#VkDeviceSize\">VkDeviceSize</a> value"
+          "text": " <code>pLayoutSizeInBytes</code> <strong class=\"purple\">must</strong> be a valid pointer to a <code>VkDeviceSize</code> value"
         },
         {
           "vuid": "VUID-vkGetDescriptorSetLayoutSizeEXT-layout-parent",
@@ -23480,7 +23408,7 @@
       "(VK_EXT_descriptor_buffer)": [
         {
           "vuid": "VUID-vkGetDescriptorSetLayoutBindingOffsetEXT-None-08013",
-          "text": " The <a href=\"#features-descriptorBuffer\"><code>descriptorBuffer</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " The <a href=\"#features-descriptorBuffer\">descriptorBuffer</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-vkGetDescriptorSetLayoutBindingOffsetEXT-layout-08014",
@@ -23496,7 +23424,7 @@
         },
         {
           "vuid": "VUID-vkGetDescriptorSetLayoutBindingOffsetEXT-pOffset-parameter",
-          "text": " <code>pOffset</code> <strong class=\"purple\">must</strong> be a valid pointer to a <a href=\"#VkDeviceSize\">VkDeviceSize</a> value"
+          "text": " <code>pOffset</code> <strong class=\"purple\">must</strong> be a valid pointer to a <code>VkDeviceSize</code> value"
         },
         {
           "vuid": "VUID-vkGetDescriptorSetLayoutBindingOffsetEXT-layout-parent",
@@ -23508,7 +23436,7 @@
       "(VK_EXT_descriptor_buffer)": [
         {
           "vuid": "VUID-vkGetDescriptorEXT-None-08015",
-          "text": " The <a href=\"#features-descriptorBuffer\"><code>descriptorBuffer</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " The <a href=\"#features-descriptorBuffer\">descriptorBuffer</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-vkGetDescriptorEXT-pDescriptor-08016",
@@ -23670,43 +23598,43 @@
       "(VK_EXT_descriptor_buffer)+(VK_EXT_robustness2)+(VK_EXT_robustness2)": [
         {
           "vuid": "VUID-VkDescriptorDataEXT-type-08034",
-          "text": " If <a href=\"#VkDescriptorGetInfoEXT\">VkDescriptorGetInfoEXT</a>:<code>type</code> is <code>VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER</code>, and the <a href=\"#features-nullDescriptor\"><code>nullDescriptor</code></a> feature is not enabled, <code>pCombinedImageSampler-&gt;imageView</code> <strong class=\"purple\">must</strong> not be <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>"
+          "text": " If <a href=\"#VkDescriptorGetInfoEXT\">VkDescriptorGetInfoEXT</a>:<code>type</code> is <code>VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER</code>, and the <a href=\"#features-nullDescriptor\">nullDescriptor</a> feature is not enabled, <code>pCombinedImageSampler-&gt;imageView</code> <strong class=\"purple\">must</strong> not be <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>"
         },
         {
           "vuid": "VUID-VkDescriptorDataEXT-type-08035",
-          "text": " If <a href=\"#VkDescriptorGetInfoEXT\">VkDescriptorGetInfoEXT</a>:<code>type</code> is <code>VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE</code>, and the <a href=\"#features-nullDescriptor\"><code>nullDescriptor</code></a> feature is not enabled, <code>pSampledImage</code> <strong class=\"purple\">must</strong> not be <code>NULL</code> and <code>pSampledImage-&gt;imageView</code> <strong class=\"purple\">must</strong> not be <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>"
+          "text": " If <a href=\"#VkDescriptorGetInfoEXT\">VkDescriptorGetInfoEXT</a>:<code>type</code> is <code>VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE</code>, and the <a href=\"#features-nullDescriptor\">nullDescriptor</a> feature is not enabled, <code>pSampledImage</code> <strong class=\"purple\">must</strong> not be <code>NULL</code> and <code>pSampledImage-&gt;imageView</code> <strong class=\"purple\">must</strong> not be <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>"
         },
         {
           "vuid": "VUID-VkDescriptorDataEXT-type-08036",
-          "text": " If <a href=\"#VkDescriptorGetInfoEXT\">VkDescriptorGetInfoEXT</a>:<code>type</code> is <code>VK_DESCRIPTOR_TYPE_STORAGE_IMAGE</code>, and the <a href=\"#features-nullDescriptor\"><code>nullDescriptor</code></a> feature is not enabled, <code>pStorageImage</code> <strong class=\"purple\">must</strong> not be <code>NULL</code> and <code>pStorageImage-&gt;imageView</code> <strong class=\"purple\">must</strong> not be <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>"
+          "text": " If <a href=\"#VkDescriptorGetInfoEXT\">VkDescriptorGetInfoEXT</a>:<code>type</code> is <code>VK_DESCRIPTOR_TYPE_STORAGE_IMAGE</code>, and the <a href=\"#features-nullDescriptor\">nullDescriptor</a> feature is not enabled, <code>pStorageImage</code> <strong class=\"purple\">must</strong> not be <code>NULL</code> and <code>pStorageImage-&gt;imageView</code> <strong class=\"purple\">must</strong> not be <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>"
         },
         {
           "vuid": "VUID-VkDescriptorDataEXT-type-08037",
-          "text": " If <a href=\"#VkDescriptorGetInfoEXT\">VkDescriptorGetInfoEXT</a>:<code>type</code> is <code>VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER</code>, and the <a href=\"#features-nullDescriptor\"><code>nullDescriptor</code></a> feature is not enabled, <code>pUniformTexelBuffer</code> <strong class=\"purple\">must</strong> not be <code>NULL</code>"
+          "text": " If <a href=\"#VkDescriptorGetInfoEXT\">VkDescriptorGetInfoEXT</a>:<code>type</code> is <code>VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER</code>, and the <a href=\"#features-nullDescriptor\">nullDescriptor</a> feature is not enabled, <code>pUniformTexelBuffer</code> <strong class=\"purple\">must</strong> not be <code>NULL</code>"
         },
         {
           "vuid": "VUID-VkDescriptorDataEXT-type-08038",
-          "text": " If <a href=\"#VkDescriptorGetInfoEXT\">VkDescriptorGetInfoEXT</a>:<code>type</code> is <code>VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER</code>, and the <a href=\"#features-nullDescriptor\"><code>nullDescriptor</code></a> feature is not enabled, <code>pStorageTexelBuffer</code> <strong class=\"purple\">must</strong> not be <code>NULL</code>"
+          "text": " If <a href=\"#VkDescriptorGetInfoEXT\">VkDescriptorGetInfoEXT</a>:<code>type</code> is <code>VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER</code>, and the <a href=\"#features-nullDescriptor\">nullDescriptor</a> feature is not enabled, <code>pStorageTexelBuffer</code> <strong class=\"purple\">must</strong> not be <code>NULL</code>"
         },
         {
           "vuid": "VUID-VkDescriptorDataEXT-type-08039",
-          "text": " If <a href=\"#VkDescriptorGetInfoEXT\">VkDescriptorGetInfoEXT</a>:<code>type</code> is <code>VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER</code>, and the <a href=\"#features-nullDescriptor\"><code>nullDescriptor</code></a> feature is not enabled, <code>pUniformBuffer</code> <strong class=\"purple\">must</strong> not be <code>NULL</code>"
+          "text": " If <a href=\"#VkDescriptorGetInfoEXT\">VkDescriptorGetInfoEXT</a>:<code>type</code> is <code>VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER</code>, and the <a href=\"#features-nullDescriptor\">nullDescriptor</a> feature is not enabled, <code>pUniformBuffer</code> <strong class=\"purple\">must</strong> not be <code>NULL</code>"
         },
         {
           "vuid": "VUID-VkDescriptorDataEXT-type-08040",
-          "text": " If <a href=\"#VkDescriptorGetInfoEXT\">VkDescriptorGetInfoEXT</a>:<code>type</code> is <code>VK_DESCRIPTOR_TYPE_STORAGE_BUFFER</code>, and the <a href=\"#features-nullDescriptor\"><code>nullDescriptor</code></a> feature is not enabled, <code>pStorageBuffer</code> <strong class=\"purple\">must</strong> not be <code>NULL</code>"
+          "text": " If <a href=\"#VkDescriptorGetInfoEXT\">VkDescriptorGetInfoEXT</a>:<code>type</code> is <code>VK_DESCRIPTOR_TYPE_STORAGE_BUFFER</code>, and the <a href=\"#features-nullDescriptor\">nullDescriptor</a> feature is not enabled, <code>pStorageBuffer</code> <strong class=\"purple\">must</strong> not be <code>NULL</code>"
         }
       ],
       "(VK_EXT_descriptor_buffer)+(VK_EXT_robustness2)+(VK_EXT_robustness2)+(VK_KHR_acceleration_structure)": [
         {
           "vuid": "VUID-VkDescriptorDataEXT-type-08041",
-          "text": " If <a href=\"#VkDescriptorGetInfoEXT\">VkDescriptorGetInfoEXT</a>:<code>type</code> is <code>VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR</code>, and the <a href=\"#features-nullDescriptor\"><code>nullDescriptor</code></a> feature is not enabled, <code>accelerationStructure</code> <strong class=\"purple\">must</strong> not be <code>0</code>"
+          "text": " If <a href=\"#VkDescriptorGetInfoEXT\">VkDescriptorGetInfoEXT</a>:<code>type</code> is <code>VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR</code>, and the <a href=\"#features-nullDescriptor\">nullDescriptor</a> feature is not enabled, <code>accelerationStructure</code> <strong class=\"purple\">must</strong> not be <code>0</code>"
         }
       ],
       "(VK_EXT_descriptor_buffer)+(VK_EXT_robustness2)+(VK_EXT_robustness2)+(VK_NV_ray_tracing)": [
         {
           "vuid": "VUID-VkDescriptorDataEXT-type-08042",
-          "text": " If <a href=\"#VkDescriptorGetInfoEXT\">VkDescriptorGetInfoEXT</a>:<code>type</code> is <code>VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV</code>, and the <a href=\"#features-nullDescriptor\"><code>nullDescriptor</code></a> feature is not enabled, <code>accelerationStructure</code> <strong class=\"purple\">must</strong> not be <code>0</code>"
+          "text": " If <a href=\"#VkDescriptorGetInfoEXT\">VkDescriptorGetInfoEXT</a>:<code>type</code> is <code>VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV</code>, and the <a href=\"#features-nullDescriptor\">nullDescriptor</a> feature is not enabled, <code>accelerationStructure</code> <strong class=\"purple\">must</strong> not be <code>0</code>"
         }
       ]
     },
@@ -23714,7 +23642,7 @@
       "(VK_EXT_descriptor_buffer)+(VK_EXT_robustness2)": [
         {
           "vuid": "VUID-VkDescriptorAddressInfoEXT-address-08043",
-          "text": " If the <a href=\"#features-nullDescriptor\"><code>nullDescriptor</code></a> feature is not enabled, <code>address</code> <strong class=\"purple\">must</strong> not be zero"
+          "text": " If the <a href=\"#features-nullDescriptor\">nullDescriptor</a> feature is not enabled, <code>address</code> <strong class=\"purple\">must</strong> not be zero"
         }
       ],
       "(VK_EXT_descriptor_buffer)": [
@@ -23748,7 +23676,7 @@
       "(VK_EXT_descriptor_buffer)": [
         {
           "vuid": "VUID-vkCmdBindDescriptorBuffersEXT-None-08047",
-          "text": " The <a href=\"#features-descriptorBuffer\"><code>descriptorBuffer</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " The <a href=\"#features-descriptorBuffer\">descriptorBuffer</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-vkCmdBindDescriptorBuffersEXT-maxSamplerDescriptorBufferBindings-08048",
@@ -23780,7 +23708,7 @@
         },
         {
           "vuid": "VUID-vkCmdBindDescriptorBuffersEXT-pBindingInfos-08055",
-          "text": " For any element of <code>pBindingInfos</code>, <code>usage</code> <strong class=\"purple\">must</strong> match the buffer from which <code>address</code> was queried"
+          "text": " For any element of <code>pBindingInfos</code>, <code>usage</code> <strong class=\"purple\">must</strong> match the buffer from which <code>address</code> was queried."
         },
         {
           "vuid": "VUID-vkCmdBindDescriptorBuffersEXT-commandBuffer-parameter",
@@ -23874,7 +23802,7 @@
       "(VK_EXT_descriptor_buffer)": [
         {
           "vuid": "VUID-vkCmdSetDescriptorBufferOffsetsEXT-None-08060",
-          "text": " The <a href=\"#features-descriptorBuffer\"><code>descriptorBuffer</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " The <a href=\"#features-descriptorBuffer\">descriptorBuffer</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-vkCmdSetDescriptorBufferOffsetsEXT-pOffsets-08061",
@@ -23922,7 +23850,7 @@
         },
         {
           "vuid": "VUID-vkCmdSetDescriptorBufferOffsetsEXT-pOffsets-parameter",
-          "text": " <code>pOffsets</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>setCount</code> <a href=\"#VkDeviceSize\">VkDeviceSize</a> values"
+          "text": " <code>pOffsets</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>setCount</code> <code>VkDeviceSize</code> values"
         },
         {
           "vuid": "VUID-vkCmdSetDescriptorBufferOffsetsEXT-commandBuffer-recording",
@@ -23962,7 +23890,7 @@
       "(VK_EXT_descriptor_buffer)": [
         {
           "vuid": "VUID-vkCmdBindDescriptorBufferEmbeddedSamplersEXT-None-08068",
-          "text": " The <a href=\"#features-descriptorBuffer\"><code>descriptorBuffer</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " The <a href=\"#features-descriptorBuffer\">descriptorBuffer</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-vkCmdBindDescriptorBufferEmbeddedSamplersEXT-pipelineBindPoint-08069",
@@ -24010,7 +23938,7 @@
       "(VK_EXT_descriptor_buffer)": [
         {
           "vuid": "VUID-vkGetBufferOpaqueCaptureDescriptorDataEXT-None-08072",
-          "text": " The <a href=\"#features-descriptorBuffer\"><code>descriptorBufferCaptureReplay</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " The <a href=\"#features-descriptorBuffer\">descriptorBufferCaptureReplay</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-vkGetBufferOpaqueCaptureDescriptorDataEXT-pData-08073",
@@ -24018,7 +23946,7 @@
         },
         {
           "vuid": "VUID-vkGetBufferOpaqueCaptureDescriptorDataEXT-device-08074",
-          "text": " If <code>device</code> was created with multiple physical devices, then the <a href=\"#features-bufferDeviceAddressMultiDevice\"><code>bufferDeviceAddressMultiDevice</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " If <code>device</code> was created with multiple physical devices, then the <a href=\"#features-bufferDeviceAddressMultiDevice\">bufferDeviceAddressMultiDevice</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-vkGetBufferOpaqueCaptureDescriptorDataEXT-device-parameter",
@@ -24058,7 +23986,7 @@
       "(VK_EXT_descriptor_buffer)": [
         {
           "vuid": "VUID-vkGetImageOpaqueCaptureDescriptorDataEXT-None-08076",
-          "text": " The <a href=\"#features-descriptorBuffer\"><code>descriptorBufferCaptureReplay</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " The <a href=\"#features-descriptorBuffer\">descriptorBufferCaptureReplay</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-vkGetImageOpaqueCaptureDescriptorDataEXT-pData-08077",
@@ -24066,7 +23994,7 @@
         },
         {
           "vuid": "VUID-vkGetImageOpaqueCaptureDescriptorDataEXT-device-08078",
-          "text": " If <code>device</code> was created with multiple physical devices, then the <a href=\"#features-bufferDeviceAddressMultiDevice\"><code>bufferDeviceAddressMultiDevice</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " If <code>device</code> was created with multiple physical devices, then the <a href=\"#features-bufferDeviceAddressMultiDevice\">bufferDeviceAddressMultiDevice</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-vkGetImageOpaqueCaptureDescriptorDataEXT-device-parameter",
@@ -24106,7 +24034,7 @@
       "(VK_EXT_descriptor_buffer)": [
         {
           "vuid": "VUID-vkGetImageViewOpaqueCaptureDescriptorDataEXT-None-08080",
-          "text": " The <a href=\"#features-descriptorBuffer\"><code>descriptorBufferCaptureReplay</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " The <a href=\"#features-descriptorBuffer\">descriptorBufferCaptureReplay</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-vkGetImageViewOpaqueCaptureDescriptorDataEXT-pData-08081",
@@ -24114,7 +24042,7 @@
         },
         {
           "vuid": "VUID-vkGetImageViewOpaqueCaptureDescriptorDataEXT-device-08082",
-          "text": " If <code>device</code> was created with multiple physical devices, then the <a href=\"#features-bufferDeviceAddressMultiDevice\"><code>bufferDeviceAddressMultiDevice</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " If <code>device</code> was created with multiple physical devices, then the <a href=\"#features-bufferDeviceAddressMultiDevice\">bufferDeviceAddressMultiDevice</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-vkGetImageViewOpaqueCaptureDescriptorDataEXT-device-parameter",
@@ -24154,7 +24082,7 @@
       "(VK_EXT_descriptor_buffer)": [
         {
           "vuid": "VUID-vkGetSamplerOpaqueCaptureDescriptorDataEXT-None-08084",
-          "text": " The <a href=\"#features-descriptorBuffer\"><code>descriptorBufferCaptureReplay</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " The <a href=\"#features-descriptorBuffer\">descriptorBufferCaptureReplay</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-vkGetSamplerOpaqueCaptureDescriptorDataEXT-pData-08085",
@@ -24162,7 +24090,7 @@
         },
         {
           "vuid": "VUID-vkGetSamplerOpaqueCaptureDescriptorDataEXT-device-08086",
-          "text": " If <code>device</code> was created with multiple physical devices, then the <a href=\"#features-bufferDeviceAddressMultiDevice\"><code>bufferDeviceAddressMultiDevice</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " If <code>device</code> was created with multiple physical devices, then the <a href=\"#features-bufferDeviceAddressMultiDevice\">bufferDeviceAddressMultiDevice</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-vkGetSamplerOpaqueCaptureDescriptorDataEXT-device-parameter",
@@ -24202,7 +24130,7 @@
       "(VK_EXT_descriptor_buffer)+(VK_NV_ray_tracing,VK_KHR_acceleration_structure)": [
         {
           "vuid": "VUID-vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT-None-08088",
-          "text": " The <a href=\"#features-descriptorBuffer\"><code>descriptorBufferCaptureReplay</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " The <a href=\"#features-descriptorBuffer\">descriptorBufferCaptureReplay</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT-pData-08089",
@@ -24210,7 +24138,7 @@
         },
         {
           "vuid": "VUID-vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT-device-08090",
-          "text": " If <code>device</code> was created with multiple physical devices, then the <a href=\"#features-bufferDeviceAddressMultiDevice\"><code>bufferDeviceAddressMultiDevice</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " If <code>device</code> was created with multiple physical devices, then the <a href=\"#features-bufferDeviceAddressMultiDevice\">bufferDeviceAddressMultiDevice</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT-device-parameter",
@@ -26204,7 +26132,7 @@
         },
         {
           "vuid": "VUID-vkCmdResetQueryPool-commandBuffer-cmdpool",
-          "text": " The <code>VkCommandPool</code> that <code>commandBuffer</code> was allocated from <strong class=\"purple\">must</strong> support graphics, compute, decode, encode, or opticalflow operations"
+          "text": " The <code>VkCommandPool</code> that <code>commandBuffer</code> was allocated from <strong class=\"purple\">must</strong> support graphics, compute, decode, or encode operations"
         },
         {
           "vuid": "VUID-vkCmdResetQueryPool-renderpass",
@@ -26538,7 +26466,7 @@
         },
         {
           "vuid": "VUID-vkCmdBeginQueryIndexedEXT-queryType-06691",
-          "text": " If the <code>queryType</code> used to create <code>queryPool</code> was <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> and the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled, the <code>index</code> parameter <strong class=\"purple\">must</strong> be zero"
+          "text": " If the <code>queryType</code> used to create <code>queryPool</code> was <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> and the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled, the <code>index</code> parameter <strong class=\"purple\">must</strong> be zero."
         },
         {
           "vuid": "VUID-vkCmdBeginQueryIndexedEXT-queryType-06692",
@@ -27031,13 +26959,13 @@
       ],
       "(VK_VERSION_1_3,VK_KHR_synchronization2)+(VK_KHR_fragment_shading_rate)+(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-vkCmdWriteTimestamp2-stage-07316",
+          "vuid": "VUID-vkCmdWriteTimestamp2-shadingRateImage-07316",
           "text": " If neither the <a href=\"#features-shadingRateImage\"><code>shadingRateImage</code></a> or <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> are enabled, pname:stage <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
       "(VK_VERSION_1_3,VK_KHR_synchronization2)+(VK_KHR_fragment_shading_rate)+!(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-vkCmdWriteTimestamp2-stage-07317",
+          "vuid": "VUID-vkCmdWriteTimestamp2-fragmentShadingRate-07317",
           "text": " If the <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> feature is not enabled, pname:stage <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
@@ -27112,7 +27040,7 @@
         },
         {
           "vuid": "VUID-vkCmdWriteTimestamp-commandBuffer-cmdpool",
-          "text": " The <code>VkCommandPool</code> that <code>commandBuffer</code> was allocated from <strong class=\"purple\">must</strong> support transfer, graphics, compute, decode, encode, or opticalflow operations"
+          "text": " The <code>VkCommandPool</code> that <code>commandBuffer</code> was allocated from <strong class=\"purple\">must</strong> support transfer, graphics, compute, decode, or encode operations"
         },
         {
           "vuid": "VUID-vkCmdWriteTimestamp-commonparent",
@@ -27144,7 +27072,7 @@
         },
         {
           "vuid": "VUID-vkCmdWriteTimestamp-pipelineStage-07077",
-          "text": " If the <a href=\"#features-taskShader\"><code>taskShader</code></a> feature is not enabled, <code>pipelineStage</code> <strong class=\"purple\">must</strong> not be <code>VK_PIPELINE_STAGE_TASK_SHADER_BIT_EXT</code>"
+          "text": " If the <a href=\"#features-taskShader\">task shaders</a> feature is not enabled, <code>pipelineStage</code> <strong class=\"purple\">must</strong> not be <code>VK_PIPELINE_STAGE_TASK_SHADER_BIT_EXT</code>"
         }
       ],
       "(VK_NV_shading_rate_image)+!(VK_KHR_fragment_shading_rate)": [
@@ -28413,10 +28341,6 @@
           "text": " For each element of <code>pRegions</code>, if the sum of <code>dstOffset.z</code> and <code>extent.depth</code> does not equal the depth of the the subresource specified by <code>dstSubresource</code>, <code>extent.depth</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent depth</a> of the <a href=\"#VkFormat\">VkFormat</a> of <code>dstImage</code>"
         },
         {
-          "vuid": "VUID-vkCmdCopyImage-srcImage-07745",
-          "text": " <code>srcImage</code> and <code>dstImage</code> <strong class=\"purple\">must</strong> have the same sample count"
-        },
-        {
           "vuid": "VUID-vkCmdCopyImage-commandBuffer-parameter",
           "text": " <code>commandBuffer</code> <strong class=\"purple\">must</strong> be a valid <a href=\"#VkCommandBuffer\">VkCommandBuffer</a> handle"
         },
@@ -28483,14 +28407,6 @@
           "text": " If <code>dstImage</code> is of type <code>VK_IMAGE_TYPE_3D</code>, then for each element of <code>pRegions</code>, <code>dstSubresource.baseArrayLayer</code> <strong class=\"purple\">must</strong> be <code>0</code> and <code>dstSubresource.layerCount</code> <strong class=\"purple\">must</strong> be <code>1</code>"
         },
         {
-          "vuid": "VUID-vkCmdCopyImage-srcImage-07743",
-          "text": " If <code>srcImage</code> and <code>dstImage</code> have a different <a href=\"#VkImageType\">VkImageType</a>, one <strong class=\"purple\">must</strong> be <code>VK_IMAGE_TYPE_3D</code> and the other <strong class=\"purple\">must</strong> be <code>VK_IMAGE_TYPE_2D</code>"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyImage-srcImage-07744",
-          "text": " If <code>srcImage</code> and <code>dstImage</code> have the same <a href=\"#VkImageType\">VkImageType</a>, the <code>layerCount</code> member of <code>srcSubresource</code> and <code>dstSubresource</code> in each element of <code>pRegions</code> <strong class=\"purple\">must</strong> match"
-        },
-        {
           "vuid": "VUID-vkCmdCopyImage-srcImage-01790",
           "text": " If <code>srcImage</code> and <code>dstImage</code> are both of type <code>VK_IMAGE_TYPE_2D</code>, then for each element of <code>pRegions</code>, <code>extent.depth</code> <strong class=\"purple\">must</strong> be <code>1</code>"
         },
@@ -28595,10 +28511,6 @@
           "text": " If either <code>srcImage</code> or <code>dstImage</code> is of type <code>VK_IMAGE_TYPE_3D</code>, then for each element of <code>pRegions</code>, <code>srcSubresource.baseArrayLayer</code> and <code>dstSubresource.baseArrayLayer</code> <strong class=\"purple\">must</strong> each be <code>0</code>, and <code>srcSubresource.layerCount</code> and <code>dstSubresource.layerCount</code> <strong class=\"purple\">must</strong> each be <code>1</code>"
         },
         {
-          "vuid": "VUID-vkCmdCopyImage-srcImage-07742",
-          "text": " <code>srcImage</code> and <code>dstImage</code> <strong class=\"purple\">must</strong> have the same <a href=\"#VkImageType\">VkImageType</a>"
-        },
-        {
           "vuid": "VUID-vkCmdCopyImage-srcImage-01789",
           "text": " If <code>srcImage</code> or <code>dstImage</code> is of type <code>VK_IMAGE_TYPE_2D</code>, then for each element of <code>pRegions</code>, <code>extent.depth</code> <strong class=\"purple\">must</strong> be <code>1</code>"
         }
@@ -28645,6 +28557,12 @@
           "text": " The <code>layerCount</code> member of <code>srcSubresource</code> and <code>dstSubresource</code> <strong class=\"purple\">must</strong> match"
         }
       ],
+      "(VK_VERSION_1_1,VK_KHR_maintenance1)": [
+        {
+          "vuid": "VUID-VkImageCopy-extent-00140",
+          "text": " The number of slices of the <code>extent</code> (for 3D) or layers of the <code>srcSubresource</code> (for non-3D) <strong class=\"purple\">must</strong> match the number of slices of the <code>extent</code> (for 3D) or layers of the <code>dstSubresource</code> (for non-3D)"
+        }
+      ],
       "core": [
         {
           "vuid": "VUID-VkImageCopy-extent-06668",
@@ -28887,10 +28805,6 @@
           "text": " For each element of <code>pRegions</code>, if the sum of <code>dstOffset.z</code> and <code>extent.depth</code> does not equal the depth of the the subresource specified by <code>dstSubresource</code>, <code>extent.depth</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent depth</a> of the <a href=\"#VkFormat\">VkFormat</a> of <code>dstImage</code>"
         },
         {
-          "vuid": "VUID-VkCopyImageInfo2-srcImage-07745",
-          "text": " <code>srcImage</code> and <code>dstImage</code> <strong class=\"purple\">must</strong> have the same sample count"
-        },
-        {
           "vuid": "VUID-VkCopyImageInfo2-sType-sType",
           "text": " <code>sType</code> <strong class=\"purple\">must</strong> be <code>VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2</code>"
         },
@@ -28945,14 +28859,6 @@
           "text": " If <code>dstImage</code> is of type <code>VK_IMAGE_TYPE_3D</code>, then for each element of <code>pRegions</code>, <code>dstSubresource.baseArrayLayer</code> <strong class=\"purple\">must</strong> be <code>0</code> and <code>dstSubresource.layerCount</code> <strong class=\"purple\">must</strong> be <code>1</code>"
         },
         {
-          "vuid": "VUID-VkCopyImageInfo2-srcImage-07743",
-          "text": " If <code>srcImage</code> and <code>dstImage</code> have a different <a href=\"#VkImageType\">VkImageType</a>, one <strong class=\"purple\">must</strong> be <code>VK_IMAGE_TYPE_3D</code> and the other <strong class=\"purple\">must</strong> be <code>VK_IMAGE_TYPE_2D</code>"
-        },
-        {
-          "vuid": "VUID-VkCopyImageInfo2-srcImage-07744",
-          "text": " If <code>srcImage</code> and <code>dstImage</code> have the same <a href=\"#VkImageType\">VkImageType</a>, the <code>layerCount</code> member of <code>srcSubresource</code> and <code>dstSubresource</code> in each element of <code>pRegions</code> <strong class=\"purple\">must</strong> match"
-        },
-        {
           "vuid": "VUID-VkCopyImageInfo2-srcImage-01790",
           "text": " If <code>srcImage</code> and <code>dstImage</code> are both of type <code>VK_IMAGE_TYPE_2D</code>, then for each element of <code>pRegions</code>, <code>extent.depth</code> <strong class=\"purple\">must</strong> be <code>1</code>"
         },
@@ -29057,10 +28963,6 @@
           "text": " If either <code>srcImage</code> or <code>dstImage</code> is of type <code>VK_IMAGE_TYPE_3D</code>, then for each element of <code>pRegions</code>, <code>srcSubresource.baseArrayLayer</code> and <code>dstSubresource.baseArrayLayer</code> <strong class=\"purple\">must</strong> each be <code>0</code>, and <code>srcSubresource.layerCount</code> and <code>dstSubresource.layerCount</code> <strong class=\"purple\">must</strong> each be <code>1</code>"
         },
         {
-          "vuid": "VUID-VkCopyImageInfo2-srcImage-07742",
-          "text": " <code>srcImage</code> and <code>dstImage</code> <strong class=\"purple\">must</strong> have the same <a href=\"#VkImageType\">VkImageType</a>"
-        },
-        {
           "vuid": "VUID-VkCopyImageInfo2-srcImage-01789",
           "text": " If <code>srcImage</code> or <code>dstImage</code> is of type <code>VK_IMAGE_TYPE_2D</code>, then for each element of <code>pRegions</code>, <code>extent.depth</code> <strong class=\"purple\">must</strong> be <code>1</code>"
         }
@@ -29107,6 +29009,12 @@
           "text": " The <code>layerCount</code> member of <code>srcSubresource</code> and <code>dstSubresource</code> <strong class=\"purple\">must</strong> match"
         }
       ],
+      "(VK_VERSION_1_3,VK_KHR_copy_commands2)+(VK_VERSION_1_1,VK_KHR_maintenance1)": [
+        {
+          "vuid": "VUID-VkImageCopy2-extent-00140",
+          "text": " The number of slices of the <code>extent</code> (for 3D) or layers of the <code>srcSubresource</code> (for non-3D) <strong class=\"purple\">must</strong> match the number of slices of the <code>extent</code> (for 3D) or layers of the <code>dstSubresource</code> (for non-3D)"
+        }
+      ],
       "(VK_VERSION_1_3,VK_KHR_copy_commands2)": [
         {
           "vuid": "VUID-VkImageCopy2-extent-06668",
@@ -29155,80 +29063,8 @@
       ],
       "core": [
         {
-          "vuid": "VUID-vkCmdCopyBufferToImage-commandBuffer-07737",
-          "text": " If the queue family used to create the <a href=\"#VkCommandPool\">VkCommandPool</a> which <code>commandBuffer</code> was allocated from does not support <code>VK_QUEUE_GRAPHICS_BIT</code> or <code>VK_QUEUE_COMPUTE_BIT</code>, the <code>bufferOffset</code> member of any element of {regionsparam} <strong class=\"purple\">must</strong> be a multiple of <code>4</code>"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-imageOffset-07738",
-          "text": " The <code>imageOffset</code> and <code>imageExtent</code> members of each element of {regionsparam} <strong class=\"purple\">must</strong> respect the image transfer granularity requirements of <code>commandBuffer</code>&#8217;s command pool&#8217;s queue family, as described in <a href=\"#VkQueueFamilyProperties\">VkQueueFamilyProperties</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-commandBuffer-07739",
-          "text": " If the queue family used to create the <a href=\"#VkCommandPool\">VkCommandPool</a> which <code>commandBuffer</code> was allocated from does not support <code>VK_QUEUE_GRAPHICS_BIT</code>, for each element of {regionsparam}, the <code>aspectMask</code> member of <code>imageSubresource</code> <strong class=\"purple\">must</strong> not be <code>VK_IMAGE_ASPECT_DEPTH_BIT</code> or <code>VK_IMAGE_ASPECT_STENCIL_BIT</code>"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-srcImage-00199",
-          "text": " If {imageparam} is of type <code>VK_IMAGE_TYPE_1D</code>, then for each element of <code>pRegions</code>, <code>imageOffset.y</code> <strong class=\"purple\">must</strong> be <code>0</code> and <code>imageExtent.height</code> <strong class=\"purple\">must</strong> be <code>1</code>"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-imageOffset-00200",
-          "text": " For each element of <code>pRegions</code>, <code>imageOffset.z</code> and <span class=\"eq\">(<code>imageExtent.depth</code> &#43; <code>imageOffset.z</code>)</span> <strong class=\"purple\">must</strong> both be greater than or equal to <code>0</code> and less than or equal to the depth of the specified <code>imageSubresource</code> of {imageparam}"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-srcImage-00201",
-          "text": " If {imageparam} is of type <code>VK_IMAGE_TYPE_1D</code> or <code>VK_IMAGE_TYPE_2D</code>, then for each element of <code>pRegions</code>, <code>imageOffset.z</code> <strong class=\"purple\">must</strong> be <code>0</code> and <code>imageExtent.depth</code> <strong class=\"purple\">must</strong> be <code>1</code>"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-bufferRowLength-00203",
-          "text": " For each element of <code>pRegions</code>, <code>bufferRowLength</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent width</a> of the <a href=\"#VkFormat\">VkFormat</a> of {imageparam}"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-bufferImageHeight-00204",
-          "text": " For each element of <code>pRegions</code>, <code>bufferImageHeight</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent height</a> of the <a href=\"#VkFormat\">VkFormat</a> of {imageparam}"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-pRegions-07273",
-          "text": " For each element of <code>pRegions</code>, <code>bufferOffset</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block size</a> of the <a href=\"#VkFormat\">VkFormat</a> of {imageparam}"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-pRegions-07274",
-          "text": " For each element of <code>pRegions</code>, <code>imageOffset.x</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent width</a> of the <a href=\"#VkFormat\">VkFormat</a> of {imageparam}"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-pRegions-07275",
-          "text": " For each element of <code>pRegions</code>, <code>imageOffset.y</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent height</a> of the <a href=\"#VkFormat\">VkFormat</a> of {imageparam}"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-pRegions-07276",
-          "text": " For each element of <code>pRegions</code>, <code>imageOffset.z</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent depth</a> of the <a href=\"#VkFormat\">VkFormat</a> of {imageparam}"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-imageExtent-00207",
-          "text": " For each element of <code>pRegions</code>, if the sum of <code>imageOffset.x</code> and <code>extent.width</code> does not equal the width of the the subresource specified by <code>srcSubresource</code>, <code>extent.width</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent width</a> of the <a href=\"#VkFormat\">VkFormat</a> of {imageparam}"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-imageExtent-00208",
-          "text": " For each element of <code>pRegions</code>, if the sum of <code>imageOffset.y</code> and <code>extent.height</code> does not equal the height of the the subresource specified by <code>srcSubresource</code>, <code>extent.height</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent height</a> of the <a href=\"#VkFormat\">VkFormat</a> of {imageparam}"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-imageExtent-00209",
-          "text": " For each element of <code>pRegions</code>, if the sum of <code>imageOffset.z</code> and <code>extent.depth</code> does not equal the depth of the the subresource specified by <code>srcSubresource</code>, <code>extent.depth</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent depth</a> of the <a href=\"#VkFormat\">VkFormat</a> of {imageparam}"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-aspectMask-00211",
-          "text": " For each element of <code>pRegions</code>, <code>imageSubresource.aspectMask</code> <strong class=\"purple\">must</strong> specify aspects present in {imageparam}"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-baseArrayLayer-00213",
-          "text": " If {imageparam} is of type <code>VK_IMAGE_TYPE_3D</code>, for each element of <code>pRegions</code>, <code>imageSubresource.baseArrayLayer</code> <strong class=\"purple\">must</strong> be <code>0</code> and <code>imageSubresource.layerCount</code> <strong class=\"purple\">must</strong> be <code>1</code>"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-pRegions-07277",
-          "text": " For each element of <code>pRegions</code>, <code>bufferRowLength</code> divided by the <a href=\"#formats-compatibility-classes\">texel block extent width</a> and then multiplied by the texel block size of {imageparam} <strong class=\"purple\">must</strong> be less than or equal to <span class=\"eq\">2<sup>31</sup>-1</span>"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-srcImage-04053",
-          "text": " If {imageparam} has a depth/stencil format, the <code>bufferOffset</code> member of any element of <code>pRegions</code> <strong class=\"purple\">must</strong> be a multiple of <code>4</code>"
+          "vuid": "VUID-vkCmdCopyBufferToImage-pRegions-06217",
+          "text": " The image region specified by each element of <code>pRegions</code> <strong class=\"purple\">must</strong> be contained within the specified <code>imageSubresource</code> of <code>dstImage</code>"
         },
         {
           "vuid": "VUID-vkCmdCopyBufferToImage-pRegions-00171",
@@ -29271,8 +29107,12 @@
           "text": " The <span class=\"eq\"><code>imageSubresource.baseArrayLayer</code> &#43; <code>imageSubresource.layerCount</code></span> of each element of <code>pRegions</code> <strong class=\"purple\">must</strong> be less than or equal to the <code>arrayLayers</code> specified in <a href=\"#VkImageCreateInfo\">VkImageCreateInfo</a> when <code>dstImage</code> was created"
         },
         {
-          "vuid": "VUID-vkCmdCopyBufferToImage-pRegions-06217",
-          "text": " The image region specified by each element of <code>pRegions</code> <strong class=\"purple\">must</strong> be contained within the specified <code>imageSubresource</code> of <code>dstImage</code>"
+          "vuid": "VUID-vkCmdCopyBufferToImage-imageOffset-01793",
+          "text": " The <code>imageOffset</code> and <code>imageExtent</code> members of each element of <code>pRegions</code> <strong class=\"purple\">must</strong> respect the image transfer granularity requirements of <code>commandBuffer</code>&#8217;s command pool&#8217;s queue family, as described in <a href=\"#VkQueueFamilyProperties\">VkQueueFamilyProperties</a>"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyBufferToImage-commandBuffer-04477",
+          "text": " If the queue family used to create the <a href=\"#VkCommandPool\">VkCommandPool</a> which <code>commandBuffer</code> was allocated from does not support <code>VK_QUEUE_GRAPHICS_BIT</code>, for each element of <code>pRegions</code>, the <code>aspectMask</code> member of <code>imageSubresource</code> <strong class=\"purple\">must</strong> not be <code>VK_IMAGE_ASPECT_DEPTH_BIT</code> or <code>VK_IMAGE_ASPECT_STENCIL_BIT</code>"
         },
         {
           "vuid": "VUID-vkCmdCopyBufferToImage-pRegions-06218",
@@ -29283,6 +29123,74 @@
           "text": " For each element of <code>pRegions</code>, <code>imageOffset.y</code> and <span class=\"eq\">(<code>imageExtent.height</code> &#43; <code>imageOffset.y</code>)</span> <strong class=\"purple\">must</strong> both be greater than or equal to <code>0</code> and less than or equal to the height of the specified <code>imageSubresource</code> of <code>dstImage</code>"
         },
         {
+          "vuid": "VUID-vkCmdCopyBufferToImage-srcImage-00199",
+          "text": " If pname:dstImage is of type <code>VK_IMAGE_TYPE_1D</code>, then for each element of <code>pRegions</code>, <code>imageOffset.y</code> <strong class=\"purple\">must</strong> be <code>0</code> and <code>imageExtent.height</code> <strong class=\"purple\">must</strong> be <code>1</code>"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyBufferToImage-imageOffset-00200",
+          "text": " For each element of <code>pRegions</code>, <code>imageOffset.z</code> and <span class=\"eq\">(<code>imageExtent.depth</code> &#43; <code>imageOffset.z</code>)</span> <strong class=\"purple\">must</strong> both be greater than or equal to <code>0</code> and less than or equal to the depth of the specified <code>imageSubresource</code> of pname:dstImage"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyBufferToImage-srcImage-00201",
+          "text": " If pname:dstImage is of type <code>VK_IMAGE_TYPE_1D</code> or <code>VK_IMAGE_TYPE_2D</code>, then for each element of <code>pRegions</code>, <code>imageOffset.z</code> <strong class=\"purple\">must</strong> be <code>0</code> and <code>imageExtent.depth</code> <strong class=\"purple\">must</strong> be <code>1</code>"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyBufferToImage-bufferRowLength-00203",
+          "text": " For each element of <code>pRegions</code>, <code>bufferRowLength</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent width</a> of the <a href=\"#VkFormat\">VkFormat</a> of pname:dstImage"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyBufferToImage-bufferImageHeight-00204",
+          "text": " For each element of <code>pRegions</code>, <code>bufferImageHeight</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent height</a> of the <a href=\"#VkFormat\">VkFormat</a> of pname:dstImage"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyBufferToImage-pRegions-07273",
+          "text": " For each element of <code>pRegions</code>, <code>bufferOffset</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block size</a> of the <a href=\"#VkFormat\">VkFormat</a> of pname:dstImage"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyBufferToImage-pRegions-07274",
+          "text": " For each element of <code>pRegions</code>, <code>imageOffset.x</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent width</a> of the <a href=\"#VkFormat\">VkFormat</a> of pname:dstImage"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyBufferToImage-pRegions-07275",
+          "text": " For each element of <code>pRegions</code>, <code>imageOffset.y</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent height</a> of the <a href=\"#VkFormat\">VkFormat</a> of pname:dstImage"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyBufferToImage-pRegions-07276",
+          "text": " For each element of <code>pRegions</code>, <code>imageOffset.z</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent depth</a> of the <a href=\"#VkFormat\">VkFormat</a> of pname:dstImage"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyBufferToImage-imageExtent-00207",
+          "text": " For each element of <code>pRegions</code>, if the sum of <code>imageOffset.x</code> and <code>extent.width</code> does not equal the width of the the subresource specified by <code>srcSubresource</code>, <code>extent.width</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent width</a> of the <a href=\"#VkFormat\">VkFormat</a> of pname:dstImage"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyBufferToImage-imageExtent-00208",
+          "text": " For each element of <code>pRegions</code>, if the sum of <code>imageOffset.y</code> and <code>extent.height</code> does not equal the height of the the subresource specified by <code>srcSubresource</code>, <code>extent.height</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent height</a> of the <a href=\"#VkFormat\">VkFormat</a> of pname:dstImage"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyBufferToImage-imageExtent-00209",
+          "text": " For each element of <code>pRegions</code>, if the sum of <code>imageOffset.z</code> and <code>extent.depth</code> does not equal the depth of the the subresource specified by <code>srcSubresource</code>, <code>extent.depth</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent depth</a> of the <a href=\"#VkFormat\">VkFormat</a> of pname:dstImage"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyBufferToImage-aspectMask-00211",
+          "text": " For each element of <code>pRegions</code>, <code>imageSubresource.aspectMask</code> <strong class=\"purple\">must</strong> specify aspects present in pname:dstImage"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyBufferToImage-baseArrayLayer-00213",
+          "text": " If pname:dstImage is of type <code>VK_IMAGE_TYPE_3D</code>, for each element of <code>pRegions</code>, <code>imageSubresource.baseArrayLayer</code> <strong class=\"purple\">must</strong> be <code>0</code> and <code>imageSubresource.layerCount</code> <strong class=\"purple\">must</strong> be <code>1</code>"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyBufferToImage-pRegions-07277",
+          "text": " For each element of <code>pRegions</code>, <code>bufferRowLength</code> divided by the <a href=\"#formats-compatibility-classes\">texel block extent width</a> and then multiplied by the texel block size of pname:dstImage <strong class=\"purple\">must</strong> be less than or equal to <span class=\"eq\">2<sup>31</sup>-1</span>"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyBufferToImage-commandBuffer-04052",
+          "text": " If the queue family used to create the <a href=\"#VkCommandPool\">VkCommandPool</a> which <code>commandBuffer</code> was allocated from does not support <code>VK_QUEUE_GRAPHICS_BIT</code> or <code>VK_QUEUE_COMPUTE_BIT</code>, the <code>bufferOffset</code> member of any element of <code>pRegions</code> <strong class=\"purple\">must</strong> be a multiple of <code>4</code>"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyBufferToImage-srcImage-04053",
+          "text": " If pname:dstImage has a depth/stencil format, the <code>bufferOffset</code> member of any element of <code>pRegions</code> <strong class=\"purple\">must</strong> be a multiple of <code>4</code>"
+        },
+        {
           "vuid": "VUID-vkCmdCopyBufferToImage-commandBuffer-parameter",
           "text": " <code>commandBuffer</code> <strong class=\"purple\">must</strong> be a valid <a href=\"#VkCommandBuffer\">VkCommandBuffer</a> handle"
         },
@@ -29327,30 +29235,6 @@
           "text": " Each of <code>commandBuffer</code>, <code>dstImage</code>, and <code>srcBuffer</code> <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from the same <a href=\"#VkDevice\">VkDevice</a>"
         }
       ],
-      "!(VK_VERSION_1_1,VK_KHR_sampler_ycbcr_conversion)": [
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-bufferOffset-00193",
-          "text": " If {imageparam} does not have a depth/stencil format, then for each element of <code>pRegions</code>, <code>bufferOffset</code> <strong class=\"purple\">must</strong> be a multiple of the format&#8217;s texel block size"
-        }
-      ],
-      "(VK_VERSION_1_1,VK_KHR_sampler_ycbcr_conversion)": [
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-bufferOffset-01558",
-          "text": " If {imageparam} does not have either a depth/stencil or a <a href=\"#formats-requiring-sampler-ycbcr-conversion\">multi-planar format</a>, then for each element of <code>pRegions</code>, <code>bufferOffset</code> <strong class=\"purple\">must</strong> be a multiple of the format&#8217;s texel block size"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-bufferOffset-01559",
-          "text": " If {imageparam} has a <a href=\"#formats-requiring-sampler-ycbcr-conversion\">multi-planar format</a>, then for each element of <code>pRegions</code>, <code>bufferOffset</code> <strong class=\"purple\">must</strong> be a multiple of the element size of the compatible format for the format and the <code>aspectMask</code> of the <code>imageSubresource</code> as defined in <a href=\"#formats-compatible-planes\">Compatible formats of planes of multi-planar formats</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-pRegions-07740",
-          "text": " If {imageparam} has a <a href=\"#VkFormat\">VkFormat</a> with <a href=\"#formats-requiring-sampler-ycbcr-conversion\">two planes</a> then for each element of <code>pRegions</code>, <code>imageSubresource.aspectMask</code> <strong class=\"purple\">must</strong> be <code>VK_IMAGE_ASPECT_PLANE_0_BIT</code> or <code>VK_IMAGE_ASPECT_PLANE_1_BIT</code>"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage-pRegions-07741",
-          "text": " If {imageparam} has a <a href=\"#VkFormat\">VkFormat</a> with <a href=\"#formats-requiring-sampler-ycbcr-conversion\">three planes</a> then for each element of <code>pRegions</code>, <code>imageSubresource.aspectMask</code> <strong class=\"purple\">must</strong> be <code>VK_IMAGE_ASPECT_PLANE_0_BIT</code>, <code>VK_IMAGE_ASPECT_PLANE_1_BIT</code>, or <code>VK_IMAGE_ASPECT_PLANE_2_BIT</code>"
-        }
-      ],
       "(VK_VERSION_1_1,VK_KHR_maintenance1)": [
         {
           "vuid": "VUID-vkCmdCopyBufferToImage-dstImage-01997",
@@ -29380,6 +29264,26 @@
           "vuid": "VUID-vkCmdCopyBufferToImage-None-00214",
           "text": " For each element of <code>pRegions</code> whose <code>imageSubresource</code> contains a depth aspect, the data in <code>srcBuffer</code> <strong class=\"purple\">must</strong> be in the range <span class=\"eq\">[0,1]</span>"
         }
+      ],
+      "!(VK_VERSION_1_1,VK_KHR_sampler_ycbcr_conversion)": [
+        {
+          "vuid": "VUID-vkCmdCopyBufferToImage-bufferOffset-00193",
+          "text": " If pname:dstImage does not have a depth/stencil format, then for each element of <code>pRegions</code>, <code>bufferOffset</code> <strong class=\"purple\">must</strong> be a multiple of the format&#8217;s texel block size"
+        }
+      ],
+      "(VK_VERSION_1_1,VK_KHR_sampler_ycbcr_conversion)": [
+        {
+          "vuid": "VUID-vkCmdCopyBufferToImage-bufferOffset-01558",
+          "text": " If pname:dstImage does not have either a depth/stencil or a <a href=\"#formats-requiring-sampler-ycbcr-conversion\">multi-planar format</a>, then for each element of <code>pRegions</code>, <code>bufferOffset</code> <strong class=\"purple\">must</strong> be a multiple of the format&#8217;s texel block size"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyBufferToImage-bufferOffset-01559",
+          "text": " If pname:dstImage has a <a href=\"#formats-requiring-sampler-ycbcr-conversion\">multi-planar format</a>, then for each element of <code>pRegions</code>, <code>bufferOffset</code> <strong class=\"purple\">must</strong> be a multiple of the element size of the compatible format for the format and the <code>aspectMask</code> of the <code>imageSubresource</code> as defined in <a href=\"#formats-compatible-planes\">Compatible formats of planes of multi-planar formats</a>"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyBufferToImage-aspectMask-01560",
+          "text": " If pname:dstImage has a <a href=\"#formats-requiring-sampler-ycbcr-conversion\">multi-planar format</a>, then for each element of <code>pRegions</code>, <code>imageSubresource.aspectMask</code> <strong class=\"purple\">must</strong> be <code>VK_IMAGE_ASPECT_PLANE_0_BIT</code>, <code>VK_IMAGE_ASPECT_PLANE_1_BIT</code>, or <code>VK_IMAGE_ASPECT_PLANE_2_BIT</code> (with <code>VK_IMAGE_ASPECT_PLANE_2_BIT</code> valid only for image formats with three planes)"
+        }
       ]
     },
     "vkCmdCopyImageToBuffer": {
@@ -29399,76 +29303,8 @@
       ],
       "core": [
         {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-commandBuffer-07746",
-          "text": " If the queue family used to create the <a href=\"#VkCommandPool\">VkCommandPool</a> which <code>commandBuffer</code> was allocated from does not support <code>VK_QUEUE_GRAPHICS_BIT</code> or <code>VK_QUEUE_COMPUTE_BIT</code>, the <code>bufferOffset</code> member of any element of {regionsparam} <strong class=\"purple\">must</strong> be a multiple of <code>4</code>"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-imageOffset-07747",
-          "text": " The <code>imageOffset</code> and <code>imageExtent</code> members of each element of {regionsparam} <strong class=\"purple\">must</strong> respect the image transfer granularity requirements of <code>commandBuffer</code>&#8217;s command pool&#8217;s queue family, as described in <a href=\"#VkQueueFamilyProperties\">VkQueueFamilyProperties</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-srcImage-00199",
-          "text": " If {imageparam} is of type <code>VK_IMAGE_TYPE_1D</code>, then for each element of <code>pRegions</code>, <code>imageOffset.y</code> <strong class=\"purple\">must</strong> be <code>0</code> and <code>imageExtent.height</code> <strong class=\"purple\">must</strong> be <code>1</code>"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-imageOffset-00200",
-          "text": " For each element of <code>pRegions</code>, <code>imageOffset.z</code> and <span class=\"eq\">(<code>imageExtent.depth</code> &#43; <code>imageOffset.z</code>)</span> <strong class=\"purple\">must</strong> both be greater than or equal to <code>0</code> and less than or equal to the depth of the specified <code>imageSubresource</code> of {imageparam}"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-srcImage-00201",
-          "text": " If {imageparam} is of type <code>VK_IMAGE_TYPE_1D</code> or <code>VK_IMAGE_TYPE_2D</code>, then for each element of <code>pRegions</code>, <code>imageOffset.z</code> <strong class=\"purple\">must</strong> be <code>0</code> and <code>imageExtent.depth</code> <strong class=\"purple\">must</strong> be <code>1</code>"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-bufferRowLength-00203",
-          "text": " For each element of <code>pRegions</code>, <code>bufferRowLength</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent width</a> of the <a href=\"#VkFormat\">VkFormat</a> of {imageparam}"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-bufferImageHeight-00204",
-          "text": " For each element of <code>pRegions</code>, <code>bufferImageHeight</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent height</a> of the <a href=\"#VkFormat\">VkFormat</a> of {imageparam}"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-pRegions-07273",
-          "text": " For each element of <code>pRegions</code>, <code>bufferOffset</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block size</a> of the <a href=\"#VkFormat\">VkFormat</a> of {imageparam}"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-pRegions-07274",
-          "text": " For each element of <code>pRegions</code>, <code>imageOffset.x</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent width</a> of the <a href=\"#VkFormat\">VkFormat</a> of {imageparam}"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-pRegions-07275",
-          "text": " For each element of <code>pRegions</code>, <code>imageOffset.y</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent height</a> of the <a href=\"#VkFormat\">VkFormat</a> of {imageparam}"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-pRegions-07276",
-          "text": " For each element of <code>pRegions</code>, <code>imageOffset.z</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent depth</a> of the <a href=\"#VkFormat\">VkFormat</a> of {imageparam}"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-imageExtent-00207",
-          "text": " For each element of <code>pRegions</code>, if the sum of <code>imageOffset.x</code> and <code>extent.width</code> does not equal the width of the the subresource specified by <code>srcSubresource</code>, <code>extent.width</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent width</a> of the <a href=\"#VkFormat\">VkFormat</a> of {imageparam}"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-imageExtent-00208",
-          "text": " For each element of <code>pRegions</code>, if the sum of <code>imageOffset.y</code> and <code>extent.height</code> does not equal the height of the the subresource specified by <code>srcSubresource</code>, <code>extent.height</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent height</a> of the <a href=\"#VkFormat\">VkFormat</a> of {imageparam}"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-imageExtent-00209",
-          "text": " For each element of <code>pRegions</code>, if the sum of <code>imageOffset.z</code> and <code>extent.depth</code> does not equal the depth of the the subresource specified by <code>srcSubresource</code>, <code>extent.depth</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent depth</a> of the <a href=\"#VkFormat\">VkFormat</a> of {imageparam}"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-aspectMask-00211",
-          "text": " For each element of <code>pRegions</code>, <code>imageSubresource.aspectMask</code> <strong class=\"purple\">must</strong> specify aspects present in {imageparam}"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-baseArrayLayer-00213",
-          "text": " If {imageparam} is of type <code>VK_IMAGE_TYPE_3D</code>, for each element of <code>pRegions</code>, <code>imageSubresource.baseArrayLayer</code> <strong class=\"purple\">must</strong> be <code>0</code> and <code>imageSubresource.layerCount</code> <strong class=\"purple\">must</strong> be <code>1</code>"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-pRegions-07277",
-          "text": " For each element of <code>pRegions</code>, <code>bufferRowLength</code> divided by the <a href=\"#formats-compatibility-classes\">texel block extent width</a> and then multiplied by the texel block size of {imageparam} <strong class=\"purple\">must</strong> be less than or equal to <span class=\"eq\">2<sup>31</sup>-1</span>"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-srcImage-04053",
-          "text": " If {imageparam} has a depth/stencil format, the <code>bufferOffset</code> member of any element of <code>pRegions</code> <strong class=\"purple\">must</strong> be a multiple of <code>4</code>"
+          "vuid": "VUID-vkCmdCopyImageToBuffer-pRegions-06220",
+          "text": " The image region specified by each element of <code>pRegions</code> <strong class=\"purple\">must</strong> be contained within the specified <code>imageSubresource</code> of <code>srcImage</code>"
         },
         {
           "vuid": "VUID-vkCmdCopyImageToBuffer-pRegions-00183",
@@ -29511,8 +29347,8 @@
           "text": " The <span class=\"eq\"><code>imageSubresource.baseArrayLayer</code> &#43; <code>imageSubresource.layerCount</code></span> of each element of <code>pRegions</code> <strong class=\"purple\">must</strong> be less than or equal to the <code>arrayLayers</code> specified in <a href=\"#VkImageCreateInfo\">VkImageCreateInfo</a> when <code>srcImage</code> was created"
         },
         {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-pRegions-06220",
-          "text": " The image region specified by each element of <code>pRegions</code> <strong class=\"purple\">must</strong> be contained within the specified <code>imageSubresource</code> of <code>srcImage</code>"
+          "vuid": "VUID-vkCmdCopyImageToBuffer-imageOffset-01794",
+          "text": " The <code>imageOffset</code> and <code>imageExtent</code> members of each element of <code>pRegions</code> <strong class=\"purple\">must</strong> respect the image transfer granularity requirements of <code>commandBuffer</code>&#8217;s command pool&#8217;s queue family, as described in <a href=\"#VkQueueFamilyProperties\">VkQueueFamilyProperties</a>"
         },
         {
           "vuid": "VUID-vkCmdCopyImageToBuffer-pRegions-06221",
@@ -29523,6 +29359,74 @@
           "text": " For each element of <code>pRegions</code>, <code>imageOffset.y</code> and <span class=\"eq\">(imageExtent.height &#43; <code>imageOffset.y</code>)</span> <strong class=\"purple\">must</strong> both be greater than or equal to <code>0</code> and less than or equal to the height of the specified <code>imageSubresource</code> of <code>srcImage</code>"
         },
         {
+          "vuid": "VUID-vkCmdCopyImageToBuffer-srcImage-00199",
+          "text": " If pname:srcImage is of type <code>VK_IMAGE_TYPE_1D</code>, then for each element of <code>pRegions</code>, <code>imageOffset.y</code> <strong class=\"purple\">must</strong> be <code>0</code> and <code>imageExtent.height</code> <strong class=\"purple\">must</strong> be <code>1</code>"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyImageToBuffer-imageOffset-00200",
+          "text": " For each element of <code>pRegions</code>, <code>imageOffset.z</code> and <span class=\"eq\">(<code>imageExtent.depth</code> &#43; <code>imageOffset.z</code>)</span> <strong class=\"purple\">must</strong> both be greater than or equal to <code>0</code> and less than or equal to the depth of the specified <code>imageSubresource</code> of pname:srcImage"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyImageToBuffer-srcImage-00201",
+          "text": " If pname:srcImage is of type <code>VK_IMAGE_TYPE_1D</code> or <code>VK_IMAGE_TYPE_2D</code>, then for each element of <code>pRegions</code>, <code>imageOffset.z</code> <strong class=\"purple\">must</strong> be <code>0</code> and <code>imageExtent.depth</code> <strong class=\"purple\">must</strong> be <code>1</code>"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyImageToBuffer-bufferRowLength-00203",
+          "text": " For each element of <code>pRegions</code>, <code>bufferRowLength</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent width</a> of the <a href=\"#VkFormat\">VkFormat</a> of pname:srcImage"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyImageToBuffer-bufferImageHeight-00204",
+          "text": " For each element of <code>pRegions</code>, <code>bufferImageHeight</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent height</a> of the <a href=\"#VkFormat\">VkFormat</a> of pname:srcImage"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyImageToBuffer-pRegions-07273",
+          "text": " For each element of <code>pRegions</code>, <code>bufferOffset</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block size</a> of the <a href=\"#VkFormat\">VkFormat</a> of pname:srcImage"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyImageToBuffer-pRegions-07274",
+          "text": " For each element of <code>pRegions</code>, <code>imageOffset.x</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent width</a> of the <a href=\"#VkFormat\">VkFormat</a> of pname:srcImage"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyImageToBuffer-pRegions-07275",
+          "text": " For each element of <code>pRegions</code>, <code>imageOffset.y</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent height</a> of the <a href=\"#VkFormat\">VkFormat</a> of pname:srcImage"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyImageToBuffer-pRegions-07276",
+          "text": " For each element of <code>pRegions</code>, <code>imageOffset.z</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent depth</a> of the <a href=\"#VkFormat\">VkFormat</a> of pname:srcImage"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyImageToBuffer-imageExtent-00207",
+          "text": " For each element of <code>pRegions</code>, if the sum of <code>imageOffset.x</code> and <code>extent.width</code> does not equal the width of the the subresource specified by <code>srcSubresource</code>, <code>extent.width</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent width</a> of the <a href=\"#VkFormat\">VkFormat</a> of pname:srcImage"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyImageToBuffer-imageExtent-00208",
+          "text": " For each element of <code>pRegions</code>, if the sum of <code>imageOffset.y</code> and <code>extent.height</code> does not equal the height of the the subresource specified by <code>srcSubresource</code>, <code>extent.height</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent height</a> of the <a href=\"#VkFormat\">VkFormat</a> of pname:srcImage"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyImageToBuffer-imageExtent-00209",
+          "text": " For each element of <code>pRegions</code>, if the sum of <code>imageOffset.z</code> and <code>extent.depth</code> does not equal the depth of the the subresource specified by <code>srcSubresource</code>, <code>extent.depth</code> <strong class=\"purple\">must</strong> be a multiple of the <a href=\"#formats-compatibility-classes\">texel block extent depth</a> of the <a href=\"#VkFormat\">VkFormat</a> of pname:srcImage"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyImageToBuffer-aspectMask-00211",
+          "text": " For each element of <code>pRegions</code>, <code>imageSubresource.aspectMask</code> <strong class=\"purple\">must</strong> specify aspects present in pname:srcImage"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyImageToBuffer-baseArrayLayer-00213",
+          "text": " If pname:srcImage is of type <code>VK_IMAGE_TYPE_3D</code>, for each element of <code>pRegions</code>, <code>imageSubresource.baseArrayLayer</code> <strong class=\"purple\">must</strong> be <code>0</code> and <code>imageSubresource.layerCount</code> <strong class=\"purple\">must</strong> be <code>1</code>"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyImageToBuffer-pRegions-07277",
+          "text": " For each element of <code>pRegions</code>, <code>bufferRowLength</code> divided by the <a href=\"#formats-compatibility-classes\">texel block extent width</a> and then multiplied by the texel block size of pname:srcImage <strong class=\"purple\">must</strong> be less than or equal to <span class=\"eq\">2<sup>31</sup>-1</span>"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyImageToBuffer-commandBuffer-04052",
+          "text": " If the queue family used to create the <a href=\"#VkCommandPool\">VkCommandPool</a> which <code>commandBuffer</code> was allocated from does not support <code>VK_QUEUE_GRAPHICS_BIT</code> or <code>VK_QUEUE_COMPUTE_BIT</code>, the <code>bufferOffset</code> member of any element of <code>pRegions</code> <strong class=\"purple\">must</strong> be a multiple of <code>4</code>"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyImageToBuffer-srcImage-04053",
+          "text": " If pname:srcImage has a depth/stencil format, the <code>bufferOffset</code> member of any element of <code>pRegions</code> <strong class=\"purple\">must</strong> be a multiple of <code>4</code>"
+        },
+        {
           "vuid": "VUID-vkCmdCopyImageToBuffer-commandBuffer-parameter",
           "text": " <code>commandBuffer</code> <strong class=\"purple\">must</strong> be a valid <a href=\"#VkCommandBuffer\">VkCommandBuffer</a> handle"
         },
@@ -29567,30 +29471,6 @@
           "text": " Each of <code>commandBuffer</code>, <code>dstBuffer</code>, and <code>srcImage</code> <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from the same <a href=\"#VkDevice\">VkDevice</a>"
         }
       ],
-      "!(VK_VERSION_1_1,VK_KHR_sampler_ycbcr_conversion)": [
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-bufferOffset-00193",
-          "text": " If {imageparam} does not have a depth/stencil format, then for each element of <code>pRegions</code>, <code>bufferOffset</code> <strong class=\"purple\">must</strong> be a multiple of the format&#8217;s texel block size"
-        }
-      ],
-      "(VK_VERSION_1_1,VK_KHR_sampler_ycbcr_conversion)": [
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-bufferOffset-01558",
-          "text": " If {imageparam} does not have either a depth/stencil or a <a href=\"#formats-requiring-sampler-ycbcr-conversion\">multi-planar format</a>, then for each element of <code>pRegions</code>, <code>bufferOffset</code> <strong class=\"purple\">must</strong> be a multiple of the format&#8217;s texel block size"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-bufferOffset-01559",
-          "text": " If {imageparam} has a <a href=\"#formats-requiring-sampler-ycbcr-conversion\">multi-planar format</a>, then for each element of <code>pRegions</code>, <code>bufferOffset</code> <strong class=\"purple\">must</strong> be a multiple of the element size of the compatible format for the format and the <code>aspectMask</code> of the <code>imageSubresource</code> as defined in <a href=\"#formats-compatible-planes\">Compatible formats of planes of multi-planar formats</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-pRegions-07740",
-          "text": " If {imageparam} has a <a href=\"#VkFormat\">VkFormat</a> with <a href=\"#formats-requiring-sampler-ycbcr-conversion\">two planes</a> then for each element of <code>pRegions</code>, <code>imageSubresource.aspectMask</code> <strong class=\"purple\">must</strong> be <code>VK_IMAGE_ASPECT_PLANE_0_BIT</code> or <code>VK_IMAGE_ASPECT_PLANE_1_BIT</code>"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer-pRegions-07741",
-          "text": " If {imageparam} has a <a href=\"#VkFormat\">VkFormat</a> with <a href=\"#formats-requiring-sampler-ycbcr-conversion\">three planes</a> then for each element of <code>pRegions</code>, <code>imageSubresource.aspectMask</code> <strong class=\"purple\">must</strong> be <code>VK_IMAGE_ASPECT_PLANE_0_BIT</code>, <code>VK_IMAGE_ASPECT_PLANE_1_BIT</code>, or <code>VK_IMAGE_ASPECT_PLANE_2_BIT</code>"
-        }
-      ],
       "(VK_VERSION_1_1,VK_KHR_maintenance1)": [
         {
           "vuid": "VUID-vkCmdCopyImageToBuffer-srcImage-01998",
@@ -29614,6 +29494,26 @@
           "vuid": "VUID-vkCmdCopyImageToBuffer-srcImage-02544",
           "text": " <code>srcImage</code> <strong class=\"purple\">must</strong> not have been created with <code>flags</code> containing <code>VK_IMAGE_CREATE_SUBSAMPLED_BIT_EXT</code>"
         }
+      ],
+      "!(VK_VERSION_1_1,VK_KHR_sampler_ycbcr_conversion)": [
+        {
+          "vuid": "VUID-vkCmdCopyImageToBuffer-bufferOffset-00193",
+          "text": " If pname:srcImage does not have a depth/stencil format, then for each element of <code>pRegions</code>, <code>bufferOffset</code> <strong class=\"purple\">must</strong> be a multiple of the format&#8217;s texel block size"
+        }
+      ],
+      "(VK_VERSION_1_1,VK_KHR_sampler_ycbcr_conversion)": [
+        {
+          "vuid": "VUID-vkCmdCopyImageToBuffer-bufferOffset-01558",
+          "text": " If pname:srcImage does not have either a depth/stencil or a <a href=\"#formats-requiring-sampler-ycbcr-conversion\">multi-planar format</a>, then for each element of <code>pRegions</code>, <code>bufferOffset</code> <strong class=\"purple\">must</strong> be a multiple of the format&#8217;s texel block size"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyImageToBuffer-bufferOffset-01559",
+          "text": " If pname:srcImage has a <a href=\"#formats-requiring-sampler-ycbcr-conversion\">multi-planar format</a>, then for each element of <code>pRegions</code>, <code>bufferOffset</code> <strong class=\"purple\">must</strong> be a multiple of the element size of the compatible format for the format and the <code>aspectMask</code> of the <code>imageSubresource</code> as defined in <a href=\"#formats-compatible-planes\">Compatible formats of planes of multi-planar formats</a>"
+        },
+        {
+          "vuid": "VUID-vkCmdCopyImageToBuffer-aspectMask-01560",
+          "text": " If pname:srcImage has a <a href=\"#formats-requiring-sampler-ycbcr-conversion\">multi-planar format</a>, then for each element of <code>pRegions</code>, <code>imageSubresource.aspectMask</code> <strong class=\"purple\">must</strong> be <code>VK_IMAGE_ASPECT_PLANE_0_BIT</code>, <code>VK_IMAGE_ASPECT_PLANE_1_BIT</code>, or <code>VK_IMAGE_ASPECT_PLANE_2_BIT</code> (with <code>VK_IMAGE_ASPECT_PLANE_2_BIT</code> valid only for image formats with three planes)"
+        }
       ]
     },
     "VkBufferImageCopy": {
@@ -29665,18 +29565,6 @@
       ],
       "(VK_VERSION_1_3,VK_KHR_copy_commands2)": [
         {
-          "vuid": "VUID-vkCmdCopyBufferToImage2-commandBuffer-07737",
-          "text": " If the queue family used to create the <a href=\"#VkCommandPool\">VkCommandPool</a> which <code>commandBuffer</code> was allocated from does not support <code>VK_QUEUE_GRAPHICS_BIT</code> or <code>VK_QUEUE_COMPUTE_BIT</code>, the <code>bufferOffset</code> member of any element of {regionsparam} <strong class=\"purple\">must</strong> be a multiple of <code>4</code>"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage2-imageOffset-07738",
-          "text": " The <code>imageOffset</code> and <code>imageExtent</code> members of each element of {regionsparam} <strong class=\"purple\">must</strong> respect the image transfer granularity requirements of <code>commandBuffer</code>&#8217;s command pool&#8217;s queue family, as described in <a href=\"#VkQueueFamilyProperties\">VkQueueFamilyProperties</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyBufferToImage2-commandBuffer-07739",
-          "text": " If the queue family used to create the <a href=\"#VkCommandPool\">VkCommandPool</a> which <code>commandBuffer</code> was allocated from does not support <code>VK_QUEUE_GRAPHICS_BIT</code>, for each element of {regionsparam}, the <code>aspectMask</code> member of <code>imageSubresource</code> <strong class=\"purple\">must</strong> not be <code>VK_IMAGE_ASPECT_DEPTH_BIT</code> or <code>VK_IMAGE_ASPECT_STENCIL_BIT</code>"
-        },
-        {
           "vuid": "VUID-vkCmdCopyBufferToImage2-commandBuffer-parameter",
           "text": " <code>commandBuffer</code> <strong class=\"purple\">must</strong> be a valid <a href=\"#VkCommandBuffer\">VkCommandBuffer</a> handle"
         },
@@ -29773,6 +29661,14 @@
           "text": " The <span class=\"eq\"><code>imageSubresource.baseArrayLayer</code> &#43; <code>imageSubresource.layerCount</code></span> of each element of <code>pRegions</code> <strong class=\"purple\">must</strong> be less than or equal to the <code>arrayLayers</code> specified in <a href=\"#VkImageCreateInfo\">VkImageCreateInfo</a> when <code>dstImage</code> was created"
         },
         {
+          "vuid": "VUID-VkCopyBufferToImageInfo2-imageOffset-01793",
+          "text": " The <code>imageOffset</code> and <code>imageExtent</code> members of each element of <code>pRegions</code> <strong class=\"purple\">must</strong> respect the image transfer granularity requirements of <code>commandBuffer</code>&#8217;s command pool&#8217;s queue family, as described in <a href=\"#VkQueueFamilyProperties\">VkQueueFamilyProperties</a>"
+        },
+        {
+          "vuid": "VUID-VkCopyBufferToImageInfo2-commandBuffer-04477",
+          "text": " If the queue family used to create the <a href=\"#VkCommandPool\">VkCommandPool</a> which <code>commandBuffer</code> was allocated from does not support <code>VK_QUEUE_GRAPHICS_BIT</code>, for each element of <code>pRegions</code>, the <code>aspectMask</code> member of <code>imageSubresource</code> <strong class=\"purple\">must</strong> not be <code>VK_IMAGE_ASPECT_DEPTH_BIT</code> or <code>VK_IMAGE_ASPECT_STENCIL_BIT</code>"
+        },
+        {
           "vuid": "VUID-VkCopyBufferToImageInfo2-pRegions-06223",
           "text": " For each element of <code>pRegions</code> not containing <code>VkCopyCommandTransformInfoQCOM</code> in its <code>pNext</code> chain, <code>imageOffset.x</code> and <span class=\"eq\">(<code>imageExtent.width</code> &#43; <code>imageOffset.x</code>)</span> <strong class=\"purple\">must</strong> both be greater than or equal to <code>0</code> and less than or equal to the width of the specified <code>imageSubresource</code> of <code>dstImage</code>"
         },
@@ -29841,6 +29737,10 @@
           "text": " For each element of <code>pRegions</code>, <code>bufferRowLength</code> divided by the <a href=\"#formats-compatibility-classes\">texel block extent width</a> and then multiplied by the texel block size of pname:dstImage <strong class=\"purple\">must</strong> be less than or equal to <span class=\"eq\">2<sup>31</sup>-1</span>"
         },
         {
+          "vuid": "VUID-VkCopyBufferToImageInfo2-commandBuffer-04052",
+          "text": " If the queue family used to create the <a href=\"#VkCommandPool\">VkCommandPool</a> which <code>commandBuffer</code> was allocated from does not support <code>VK_QUEUE_GRAPHICS_BIT</code> or <code>VK_QUEUE_COMPUTE_BIT</code>, the <code>bufferOffset</code> member of any element of <code>pRegions</code> <strong class=\"purple\">must</strong> be a multiple of <code>4</code>"
+        },
+        {
           "vuid": "VUID-VkCopyBufferToImageInfo2-srcImage-04053",
           "text": " If pname:dstImage has a depth/stencil format, the <code>bufferOffset</code> member of any element of <code>pRegions</code> <strong class=\"purple\">must</strong> be a multiple of <code>4</code>"
         },
@@ -29923,12 +29823,8 @@
           "text": " If pname:dstImage has a <a href=\"#formats-requiring-sampler-ycbcr-conversion\">multi-planar format</a>, then for each element of <code>pRegions</code>, <code>bufferOffset</code> <strong class=\"purple\">must</strong> be a multiple of the element size of the compatible format for the format and the <code>aspectMask</code> of the <code>imageSubresource</code> as defined in <a href=\"#formats-compatible-planes\">Compatible formats of planes of multi-planar formats</a>"
         },
         {
-          "vuid": "VUID-VkCopyBufferToImageInfo2-pRegions-07740",
-          "text": " If pname:dstImage has a <a href=\"#VkFormat\">VkFormat</a> with <a href=\"#formats-requiring-sampler-ycbcr-conversion\">two planes</a> then for each element of <code>pRegions</code>, <code>imageSubresource.aspectMask</code> <strong class=\"purple\">must</strong> be <code>VK_IMAGE_ASPECT_PLANE_0_BIT</code> or <code>VK_IMAGE_ASPECT_PLANE_1_BIT</code>"
-        },
-        {
-          "vuid": "VUID-VkCopyBufferToImageInfo2-pRegions-07741",
-          "text": " If pname:dstImage has a <a href=\"#VkFormat\">VkFormat</a> with <a href=\"#formats-requiring-sampler-ycbcr-conversion\">three planes</a> then for each element of <code>pRegions</code>, <code>imageSubresource.aspectMask</code> <strong class=\"purple\">must</strong> be <code>VK_IMAGE_ASPECT_PLANE_0_BIT</code>, <code>VK_IMAGE_ASPECT_PLANE_1_BIT</code>, or <code>VK_IMAGE_ASPECT_PLANE_2_BIT</code>"
+          "vuid": "VUID-VkCopyBufferToImageInfo2-aspectMask-01560",
+          "text": " If pname:dstImage has a <a href=\"#formats-requiring-sampler-ycbcr-conversion\">multi-planar format</a>, then for each element of <code>pRegions</code>, <code>imageSubresource.aspectMask</code> <strong class=\"purple\">must</strong> be <code>VK_IMAGE_ASPECT_PLANE_0_BIT</code>, <code>VK_IMAGE_ASPECT_PLANE_1_BIT</code>, or <code>VK_IMAGE_ASPECT_PLANE_2_BIT</code> (with <code>VK_IMAGE_ASPECT_PLANE_2_BIT</code> valid only for image formats with three planes)"
         }
       ]
     },
@@ -29949,14 +29845,6 @@
       ],
       "(VK_VERSION_1_3,VK_KHR_copy_commands2)": [
         {
-          "vuid": "VUID-vkCmdCopyImageToBuffer2-commandBuffer-07746",
-          "text": " If the queue family used to create the <a href=\"#VkCommandPool\">VkCommandPool</a> which <code>commandBuffer</code> was allocated from does not support <code>VK_QUEUE_GRAPHICS_BIT</code> or <code>VK_QUEUE_COMPUTE_BIT</code>, the <code>bufferOffset</code> member of any element of {regionsparam} <strong class=\"purple\">must</strong> be a multiple of <code>4</code>"
-        },
-        {
-          "vuid": "VUID-vkCmdCopyImageToBuffer2-imageOffset-07747",
-          "text": " The <code>imageOffset</code> and <code>imageExtent</code> members of each element of {regionsparam} <strong class=\"purple\">must</strong> respect the image transfer granularity requirements of <code>commandBuffer</code>&#8217;s command pool&#8217;s queue family, as described in <a href=\"#VkQueueFamilyProperties\">VkQueueFamilyProperties</a>"
-        },
-        {
           "vuid": "VUID-vkCmdCopyImageToBuffer2-commandBuffer-parameter",
           "text": " <code>commandBuffer</code> <strong class=\"purple\">must</strong> be a valid <a href=\"#VkCommandBuffer\">VkCommandBuffer</a> handle"
         },
@@ -30053,6 +29941,10 @@
           "text": " The <span class=\"eq\"><code>imageSubresource.baseArrayLayer</code> &#43; <code>imageSubresource.layerCount</code></span> of each element of <code>pRegions</code> <strong class=\"purple\">must</strong> be less than or equal to the <code>arrayLayers</code> specified in <a href=\"#VkImageCreateInfo\">VkImageCreateInfo</a> when <code>srcImage</code> was created"
         },
         {
+          "vuid": "VUID-VkCopyImageToBufferInfo2-imageOffset-01794",
+          "text": " The <code>imageOffset</code> and <code>imageExtent</code> members of each element of <code>pRegions</code> <strong class=\"purple\">must</strong> respect the image transfer granularity requirements of <code>commandBuffer</code>&#8217;s command pool&#8217;s queue family, as described in <a href=\"#VkQueueFamilyProperties\">VkQueueFamilyProperties</a>"
+        },
+        {
           "vuid": "VUID-VkCopyImageToBufferInfo2-imageOffset-00197",
           "text": " For each element of <code>pRegions</code> not containing <code>VkCopyCommandTransformInfoQCOM</code> in its <code>pNext</code> chain, <code>imageOffset.x</code> and <span class=\"eq\">(<code>imageExtent.width</code> &#43; <code>imageOffset.x</code>)</span> <strong class=\"purple\">must</strong> both be greater than or equal to <code>0</code> and less than or equal to the width of the specified <code>imageSubresource</code> of <code>srcImage</code>"
         },
@@ -30121,6 +30013,10 @@
           "text": " For each element of <code>pRegions</code>, <code>bufferRowLength</code> divided by the <a href=\"#formats-compatibility-classes\">texel block extent width</a> and then multiplied by the texel block size of pname:srcImage <strong class=\"purple\">must</strong> be less than or equal to <span class=\"eq\">2<sup>31</sup>-1</span>"
         },
         {
+          "vuid": "VUID-VkCopyImageToBufferInfo2-commandBuffer-04052",
+          "text": " If the queue family used to create the <a href=\"#VkCommandPool\">VkCommandPool</a> which <code>commandBuffer</code> was allocated from does not support <code>VK_QUEUE_GRAPHICS_BIT</code> or <code>VK_QUEUE_COMPUTE_BIT</code>, the <code>bufferOffset</code> member of any element of <code>pRegions</code> <strong class=\"purple\">must</strong> be a multiple of <code>4</code>"
+        },
+        {
           "vuid": "VUID-VkCopyImageToBufferInfo2-srcImage-04053",
           "text": " If pname:srcImage has a depth/stencil format, the <code>bufferOffset</code> member of any element of <code>pRegions</code> <strong class=\"purple\">must</strong> be a multiple of <code>4</code>"
         },
@@ -30197,12 +30093,8 @@
           "text": " If pname:srcImage has a <a href=\"#formats-requiring-sampler-ycbcr-conversion\">multi-planar format</a>, then for each element of <code>pRegions</code>, <code>bufferOffset</code> <strong class=\"purple\">must</strong> be a multiple of the element size of the compatible format for the format and the <code>aspectMask</code> of the <code>imageSubresource</code> as defined in <a href=\"#formats-compatible-planes\">Compatible formats of planes of multi-planar formats</a>"
         },
         {
-          "vuid": "VUID-VkCopyImageToBufferInfo2-pRegions-07740",
-          "text": " If pname:srcImage has a <a href=\"#VkFormat\">VkFormat</a> with <a href=\"#formats-requiring-sampler-ycbcr-conversion\">two planes</a> then for each element of <code>pRegions</code>, <code>imageSubresource.aspectMask</code> <strong class=\"purple\">must</strong> be <code>VK_IMAGE_ASPECT_PLANE_0_BIT</code> or <code>VK_IMAGE_ASPECT_PLANE_1_BIT</code>"
-        },
-        {
-          "vuid": "VUID-VkCopyImageToBufferInfo2-pRegions-07741",
-          "text": " If pname:srcImage has a <a href=\"#VkFormat\">VkFormat</a> with <a href=\"#formats-requiring-sampler-ycbcr-conversion\">three planes</a> then for each element of <code>pRegions</code>, <code>imageSubresource.aspectMask</code> <strong class=\"purple\">must</strong> be <code>VK_IMAGE_ASPECT_PLANE_0_BIT</code>, <code>VK_IMAGE_ASPECT_PLANE_1_BIT</code>, or <code>VK_IMAGE_ASPECT_PLANE_2_BIT</code>"
+          "vuid": "VUID-VkCopyImageToBufferInfo2-aspectMask-01560",
+          "text": " If pname:srcImage has a <a href=\"#formats-requiring-sampler-ycbcr-conversion\">multi-planar format</a>, then for each element of <code>pRegions</code>, <code>imageSubresource.aspectMask</code> <strong class=\"purple\">must</strong> be <code>VK_IMAGE_ASPECT_PLANE_0_BIT</code>, <code>VK_IMAGE_ASPECT_PLANE_1_BIT</code>, or <code>VK_IMAGE_ASPECT_PLANE_2_BIT</code> (with <code>VK_IMAGE_ASPECT_PLANE_2_BIT</code> valid only for image formats with three planes)"
         }
       ]
     },
@@ -30266,7 +30158,7 @@
       "(VK_NV_copy_memory_indirect)": [
         {
           "vuid": "VUID-vkCmdCopyMemoryIndirectNV-None-07653",
-          "text": " The <a href=\"#features-indirectCopy\"><code>indirectCopy</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " The <a href=\"#features-indirectCopy\">indirect copies</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-vkCmdCopyMemoryIndirectNV-copyBufferAddress-07654",
@@ -30322,7 +30214,7 @@
       "(VK_NV_copy_memory_indirect)": [
         {
           "vuid": "VUID-vkCmdCopyMemoryToImageIndirectNV-None-07660",
-          "text": " The <a href=\"#features-indirectCopy\"><code>indirectCopy</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " The <a href=\"#features-indirectCopy\">indirect copies</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-vkCmdCopyMemoryToImageIndirectNV-dstImage-07661",
@@ -30366,7 +30258,7 @@
         },
         {
           "vuid": "VUID-vkCmdCopyMemoryToImageIndirectNV-commandBuffer-07674",
-          "text": " If the queue family used to create the <a href=\"#VkCommandPool\">VkCommandPool</a> which <code>commandBuffer</code> was allocated from does not support <code>VK_QUEUE_GRAPHICS_BIT</code>, for each region, the <code>aspectMask</code> member of <code>pImageSubresources</code> <strong class=\"purple\">must</strong> not be <code>VK_IMAGE_ASPECT_DEPTH_BIT</code> or <code>VK_IMAGE_ASPECT_STENCIL_BIT</code>"
+          "text": " If the queue family used to create the <a href=\"#VkCommandPool\">VkCommandPool</a> which <code>commandBuffer</code> was allocated from does not support <code>VK_QUEUE_GRAPHICS_BIT</code>, for each region, the <code>aspectMask</code> member of <code>pImageSubresources</code> <strong class=\"purple\">must</strong> not be <code>VK_IMAGE_ASPECT_DEPTH_BIT</code> or <code>VK_IMAGE_ASPECT_STENCIL_BIT</code>."
         },
         {
           "vuid": "VUID-vkCmdCopyMemoryToImageIndirectNV-imageOffset-07675",
@@ -31661,13 +31553,13 @@
       ],
       "(VK_AMD_buffer_marker)+(VK_VERSION_1_3,VK_KHR_synchronization2)+(VK_KHR_fragment_shading_rate)+(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-vkCmdWriteBufferMarker2AMD-stage-07316",
+          "vuid": "VUID-vkCmdWriteBufferMarker2AMD-shadingRateImage-07316",
           "text": " If neither the <a href=\"#features-shadingRateImage\"><code>shadingRateImage</code></a> or <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> are enabled, pname:stage <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
       "(VK_AMD_buffer_marker)+(VK_VERSION_1_3,VK_KHR_synchronization2)+(VK_KHR_fragment_shading_rate)+!(VK_NV_shading_rate_image)": [
         {
-          "vuid": "VUID-vkCmdWriteBufferMarker2AMD-stage-07317",
+          "vuid": "VUID-vkCmdWriteBufferMarker2AMD-fragmentShadingRate-07317",
           "text": " If the <a href=\"#features-attachmentFragmentShadingRate\"><code>attachmentFragmentShadingRate</code></a> feature is not enabled, pname:stage <strong class=\"purple\">must</strong> not contain <code>VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR</code>"
         }
       ],
@@ -31768,7 +31660,7 @@
         },
         {
           "vuid": "VUID-vkCmdWriteBufferMarkerAMD-pipelineStage-07077",
-          "text": " If the <a href=\"#features-taskShader\"><code>taskShader</code></a> feature is not enabled, <code>pipelineStage</code> <strong class=\"purple\">must</strong> not be <code>VK_PIPELINE_STAGE_TASK_SHADER_BIT_EXT</code>"
+          "text": " If the <a href=\"#features-taskShader\">task shaders</a> feature is not enabled, <code>pipelineStage</code> <strong class=\"purple\">must</strong> not be <code>VK_PIPELINE_STAGE_TASK_SHADER_BIT_EXT</code>"
         }
       ],
       "(VK_AMD_buffer_marker)+(VK_NV_shading_rate_image)+!(VK_KHR_fragment_shading_rate)": [
@@ -32011,14 +31903,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdDraw-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdDraw-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdDraw-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -32039,8 +31923,8 @@
           "text": " The subpass index of the current render pass <strong class=\"purple\">must</strong> be equal to the <code>subpass</code> member of the <code>VkGraphicsPipelineCreateInfo</code> structure specified when creating the <code>VkPipeline</code> bound to <code>VK_PIPELINE_BIND_POINT_GRAPHICS</code>"
         },
         {
-          "vuid": "VUID-vkCmdDraw-None-07748",
-          "text": " If any shader statically accesses an input attachment, a valid descriptor <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
+          "vuid": "VUID-vkCmdDraw-None-02686",
+          "text": " Every input attachment used by the current subpass <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
         },
         {
           "vuid": "VUID-vkCmdDraw-OpTypeImage-07468",
@@ -32048,7 +31932,7 @@
         },
         {
           "vuid": "VUID-vkCmdDraw-None-07469",
-          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition, and be created with a <a href=\"#VkImageView\">VkImageView</a> that is compatible with the attachment referenced by the subpass' <code>pInputAttachments</code>[<code>InputAttachmentIndex</code>] in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> as specified by <a href=\"#compatibility-inputattachment\">Fragment Input Attachment Compatibility</a>"
+          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition be created with a <a href=\"#VkImageView\">VkImageView</a> that is an attachment in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> at an index that corresponds to a valid input attachment in the current subpass"
         },
         {
           "vuid": "VUID-vkCmdDraw-None-06537",
@@ -32110,7 +31994,7 @@
       "!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdDraw-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -32200,7 +32084,7 @@
         },
         {
           "vuid": "VUID-vkCmdDraw-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "!(VK_EXT_pipeline_robustness)": [
@@ -32296,15 +32180,15 @@
         },
         {
           "vuid": "VUID-vkCmdDraw-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdDraw-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdDraw-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ],
       "(VK_VERSION_1_1,VK_KHR_multiview)": [
@@ -32471,18 +32355,12 @@
       ],
       "(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_color_write_enable)": [
         {
-          "vuid": "VUID-vkCmdDraw-None-07749",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDraw-attachmentCount-06667",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
         },
         {
-          "vuid": "VUID-vkCmdDraw-attachmentCount-07750",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
-        }
-      ],
-      "(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_discard_rectangles)": [
-        {
-          "vuid": "VUID-vkCmdDraw-None-07751",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetDiscardRectangleEXT\">vkCmdSetDiscardRectangleEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDraw-attachmentCount-06815",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be less than or equal to the <code>maxColorAttachments</code> member of <code>VkPhysicalDeviceLimits</code>"
         }
       ],
       "(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_KHR_fragment_shading_rate)": [
@@ -32546,13 +32424,13 @@
       "(VK_EXT_primitives_generated_query)": [
         {
           "vuid": "VUID-vkCmdDraw-primitivesGeneratedQueryWithRasterizerDiscard-06708",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled."
         }
       ],
       "(VK_EXT_primitives_generated_query)+(VK_EXT_transform_feedback)": [
         {
           "vuid": "VUID-vkCmdDraw-primitivesGeneratedQueryWithNonZeroStreams-06709",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>."
         }
       ],
       "(VK_EXT_extended_dynamic_state3)": [
@@ -32939,14 +32817,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdDrawIndexed-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdDrawIndexed-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdDrawIndexed-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -32967,8 +32837,8 @@
           "text": " The subpass index of the current render pass <strong class=\"purple\">must</strong> be equal to the <code>subpass</code> member of the <code>VkGraphicsPipelineCreateInfo</code> structure specified when creating the <code>VkPipeline</code> bound to <code>VK_PIPELINE_BIND_POINT_GRAPHICS</code>"
         },
         {
-          "vuid": "VUID-vkCmdDrawIndexed-None-07748",
-          "text": " If any shader statically accesses an input attachment, a valid descriptor <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
+          "vuid": "VUID-vkCmdDrawIndexed-None-02686",
+          "text": " Every input attachment used by the current subpass <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
         },
         {
           "vuid": "VUID-vkCmdDrawIndexed-OpTypeImage-07468",
@@ -32976,7 +32846,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawIndexed-None-07469",
-          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition, and be created with a <a href=\"#VkImageView\">VkImageView</a> that is compatible with the attachment referenced by the subpass' <code>pInputAttachments</code>[<code>InputAttachmentIndex</code>] in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> as specified by <a href=\"#compatibility-inputattachment\">Fragment Input Attachment Compatibility</a>"
+          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition be created with a <a href=\"#VkImageView\">VkImageView</a> that is an attachment in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> at an index that corresponds to a valid input attachment in the current subpass"
         },
         {
           "vuid": "VUID-vkCmdDrawIndexed-None-06537",
@@ -33046,7 +32916,7 @@
       "!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdDrawIndexed-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -33136,7 +33006,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawIndexed-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "!(VK_EXT_pipeline_robustness)": [
@@ -33232,15 +33102,15 @@
         },
         {
           "vuid": "VUID-vkCmdDrawIndexed-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdDrawIndexed-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdDrawIndexed-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ],
       "(VK_VERSION_1_1,VK_KHR_multiview)": [
@@ -33407,18 +33277,12 @@
       ],
       "(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_color_write_enable)": [
         {
-          "vuid": "VUID-vkCmdDrawIndexed-None-07749",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawIndexed-attachmentCount-06667",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
         },
         {
-          "vuid": "VUID-vkCmdDrawIndexed-attachmentCount-07750",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
-        }
-      ],
-      "(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_discard_rectangles)": [
-        {
-          "vuid": "VUID-vkCmdDrawIndexed-None-07751",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetDiscardRectangleEXT\">vkCmdSetDiscardRectangleEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawIndexed-attachmentCount-06815",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be less than or equal to the <code>maxColorAttachments</code> member of <code>VkPhysicalDeviceLimits</code>"
         }
       ],
       "(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_KHR_fragment_shading_rate)": [
@@ -33482,13 +33346,13 @@
       "(VK_EXT_primitives_generated_query)": [
         {
           "vuid": "VUID-vkCmdDrawIndexed-primitivesGeneratedQueryWithRasterizerDiscard-06708",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled."
         }
       ],
       "(VK_EXT_primitives_generated_query)+(VK_EXT_transform_feedback)": [
         {
           "vuid": "VUID-vkCmdDrawIndexed-primitivesGeneratedQueryWithNonZeroStreams-06709",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>."
         }
       ],
       "(VK_EXT_extended_dynamic_state3)": [
@@ -33875,14 +33739,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdDrawMultiEXT-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdDrawMultiEXT-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdDrawMultiEXT-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -33903,8 +33759,8 @@
           "text": " The subpass index of the current render pass <strong class=\"purple\">must</strong> be equal to the <code>subpass</code> member of the <code>VkGraphicsPipelineCreateInfo</code> structure specified when creating the <code>VkPipeline</code> bound to <code>VK_PIPELINE_BIND_POINT_GRAPHICS</code>"
         },
         {
-          "vuid": "VUID-vkCmdDrawMultiEXT-None-07748",
-          "text": " If any shader statically accesses an input attachment, a valid descriptor <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
+          "vuid": "VUID-vkCmdDrawMultiEXT-None-02686",
+          "text": " Every input attachment used by the current subpass <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
         },
         {
           "vuid": "VUID-vkCmdDrawMultiEXT-OpTypeImage-07468",
@@ -33912,7 +33768,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMultiEXT-None-07469",
-          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition, and be created with a <a href=\"#VkImageView\">VkImageView</a> that is compatible with the attachment referenced by the subpass' <code>pInputAttachments</code>[<code>InputAttachmentIndex</code>] in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> as specified by <a href=\"#compatibility-inputattachment\">Fragment Input Attachment Compatibility</a>"
+          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition be created with a <a href=\"#VkImageView\">VkImageView</a> that is an attachment in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> at an index that corresponds to a valid input attachment in the current subpass"
         },
         {
           "vuid": "VUID-vkCmdDrawMultiEXT-None-06537",
@@ -33990,7 +33846,7 @@
       "(VK_EXT_multi_draw)+!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdDrawMultiEXT-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_EXT_multi_draw)+(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -34080,7 +33936,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMultiEXT-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "(VK_EXT_multi_draw)+!(VK_EXT_pipeline_robustness)": [
@@ -34176,15 +34032,15 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMultiEXT-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdDrawMultiEXT-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdDrawMultiEXT-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ],
       "(VK_EXT_multi_draw)+(VK_VERSION_1_1,VK_KHR_multiview)": [
@@ -34351,18 +34207,12 @@
       ],
       "(VK_EXT_multi_draw)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_color_write_enable)": [
         {
-          "vuid": "VUID-vkCmdDrawMultiEXT-None-07749",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawMultiEXT-attachmentCount-06667",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
         },
         {
-          "vuid": "VUID-vkCmdDrawMultiEXT-attachmentCount-07750",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
-        }
-      ],
-      "(VK_EXT_multi_draw)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_discard_rectangles)": [
-        {
-          "vuid": "VUID-vkCmdDrawMultiEXT-None-07751",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetDiscardRectangleEXT\">vkCmdSetDiscardRectangleEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawMultiEXT-attachmentCount-06815",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be less than or equal to the <code>maxColorAttachments</code> member of <code>VkPhysicalDeviceLimits</code>"
         }
       ],
       "(VK_EXT_multi_draw)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_KHR_fragment_shading_rate)": [
@@ -34426,13 +34276,13 @@
       "(VK_EXT_multi_draw)+(VK_EXT_primitives_generated_query)": [
         {
           "vuid": "VUID-vkCmdDrawMultiEXT-primitivesGeneratedQueryWithRasterizerDiscard-06708",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled."
         }
       ],
       "(VK_EXT_multi_draw)+(VK_EXT_primitives_generated_query)+(VK_EXT_transform_feedback)": [
         {
           "vuid": "VUID-vkCmdDrawMultiEXT-primitivesGeneratedQueryWithNonZeroStreams-06709",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>."
         }
       ],
       "(VK_EXT_multi_draw)+(VK_EXT_extended_dynamic_state3)": [
@@ -34819,14 +34669,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdDrawMultiIndexedEXT-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdDrawMultiIndexedEXT-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdDrawMultiIndexedEXT-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -34847,8 +34689,8 @@
           "text": " The subpass index of the current render pass <strong class=\"purple\">must</strong> be equal to the <code>subpass</code> member of the <code>VkGraphicsPipelineCreateInfo</code> structure specified when creating the <code>VkPipeline</code> bound to <code>VK_PIPELINE_BIND_POINT_GRAPHICS</code>"
         },
         {
-          "vuid": "VUID-vkCmdDrawMultiIndexedEXT-None-07748",
-          "text": " If any shader statically accesses an input attachment, a valid descriptor <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
+          "vuid": "VUID-vkCmdDrawMultiIndexedEXT-None-02686",
+          "text": " Every input attachment used by the current subpass <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
         },
         {
           "vuid": "VUID-vkCmdDrawMultiIndexedEXT-OpTypeImage-07468",
@@ -34856,7 +34698,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMultiIndexedEXT-None-07469",
-          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition, and be created with a <a href=\"#VkImageView\">VkImageView</a> that is compatible with the attachment referenced by the subpass' <code>pInputAttachments</code>[<code>InputAttachmentIndex</code>] in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> as specified by <a href=\"#compatibility-inputattachment\">Fragment Input Attachment Compatibility</a>"
+          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition be created with a <a href=\"#VkImageView\">VkImageView</a> that is an attachment in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> at an index that corresponds to a valid input attachment in the current subpass"
         },
         {
           "vuid": "VUID-vkCmdDrawMultiIndexedEXT-None-06537",
@@ -34946,7 +34788,7 @@
       "(VK_EXT_multi_draw)+!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdDrawMultiIndexedEXT-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_EXT_multi_draw)+(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -35036,7 +34878,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMultiIndexedEXT-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "(VK_EXT_multi_draw)+!(VK_EXT_pipeline_robustness)": [
@@ -35132,15 +34974,15 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMultiIndexedEXT-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdDrawMultiIndexedEXT-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdDrawMultiIndexedEXT-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ],
       "(VK_EXT_multi_draw)+(VK_VERSION_1_1,VK_KHR_multiview)": [
@@ -35307,18 +35149,12 @@
       ],
       "(VK_EXT_multi_draw)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_color_write_enable)": [
         {
-          "vuid": "VUID-vkCmdDrawMultiIndexedEXT-None-07749",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawMultiIndexedEXT-attachmentCount-06667",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
         },
         {
-          "vuid": "VUID-vkCmdDrawMultiIndexedEXT-attachmentCount-07750",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
-        }
-      ],
-      "(VK_EXT_multi_draw)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_discard_rectangles)": [
-        {
-          "vuid": "VUID-vkCmdDrawMultiIndexedEXT-None-07751",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetDiscardRectangleEXT\">vkCmdSetDiscardRectangleEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawMultiIndexedEXT-attachmentCount-06815",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be less than or equal to the <code>maxColorAttachments</code> member of <code>VkPhysicalDeviceLimits</code>"
         }
       ],
       "(VK_EXT_multi_draw)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_KHR_fragment_shading_rate)": [
@@ -35382,13 +35218,13 @@
       "(VK_EXT_multi_draw)+(VK_EXT_primitives_generated_query)": [
         {
           "vuid": "VUID-vkCmdDrawMultiIndexedEXT-primitivesGeneratedQueryWithRasterizerDiscard-06708",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled."
         }
       ],
       "(VK_EXT_multi_draw)+(VK_EXT_primitives_generated_query)+(VK_EXT_transform_feedback)": [
         {
           "vuid": "VUID-vkCmdDrawMultiIndexedEXT-primitivesGeneratedQueryWithNonZeroStreams-06709",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>."
         }
       ],
       "(VK_EXT_multi_draw)+(VK_EXT_extended_dynamic_state3)": [
@@ -35775,14 +35611,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdDrawIndirect-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdDrawIndirect-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdDrawIndirect-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -35803,8 +35631,8 @@
           "text": " The subpass index of the current render pass <strong class=\"purple\">must</strong> be equal to the <code>subpass</code> member of the <code>VkGraphicsPipelineCreateInfo</code> structure specified when creating the <code>VkPipeline</code> bound to <code>VK_PIPELINE_BIND_POINT_GRAPHICS</code>"
         },
         {
-          "vuid": "VUID-vkCmdDrawIndirect-None-07748",
-          "text": " If any shader statically accesses an input attachment, a valid descriptor <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
+          "vuid": "VUID-vkCmdDrawIndirect-None-02686",
+          "text": " Every input attachment used by the current subpass <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
         },
         {
           "vuid": "VUID-vkCmdDrawIndirect-OpTypeImage-07468",
@@ -35812,7 +35640,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawIndirect-None-07469",
-          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition, and be created with a <a href=\"#VkImageView\">VkImageView</a> that is compatible with the attachment referenced by the subpass' <code>pInputAttachments</code>[<code>InputAttachmentIndex</code>] in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> as specified by <a href=\"#compatibility-inputattachment\">Fragment Input Attachment Compatibility</a>"
+          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition be created with a <a href=\"#VkImageView\">VkImageView</a> that is an attachment in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> at an index that corresponds to a valid input attachment in the current subpass"
         },
         {
           "vuid": "VUID-vkCmdDrawIndirect-None-06537",
@@ -35914,7 +35742,7 @@
       "!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdDrawIndirect-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -36004,7 +35832,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawIndirect-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "!(VK_EXT_pipeline_robustness)": [
@@ -36096,15 +35924,15 @@
         },
         {
           "vuid": "VUID-vkCmdDrawIndirect-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdDrawIndirect-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdDrawIndirect-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ],
       "(VK_VERSION_1_1,VK_KHR_multiview)": [
@@ -36271,18 +36099,12 @@
       ],
       "(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_color_write_enable)": [
         {
-          "vuid": "VUID-vkCmdDrawIndirect-None-07749",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawIndirect-attachmentCount-06667",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
         },
         {
-          "vuid": "VUID-vkCmdDrawIndirect-attachmentCount-07750",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
-        }
-      ],
-      "(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_discard_rectangles)": [
-        {
-          "vuid": "VUID-vkCmdDrawIndirect-None-07751",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetDiscardRectangleEXT\">vkCmdSetDiscardRectangleEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawIndirect-attachmentCount-06815",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be less than or equal to the <code>maxColorAttachments</code> member of <code>VkPhysicalDeviceLimits</code>"
         }
       ],
       "(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_KHR_fragment_shading_rate)": [
@@ -36346,13 +36168,13 @@
       "(VK_EXT_primitives_generated_query)": [
         {
           "vuid": "VUID-vkCmdDrawIndirect-primitivesGeneratedQueryWithRasterizerDiscard-06708",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled."
         }
       ],
       "(VK_EXT_primitives_generated_query)+(VK_EXT_transform_feedback)": [
         {
           "vuid": "VUID-vkCmdDrawIndirect-primitivesGeneratedQueryWithNonZeroStreams-06709",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>."
         }
       ],
       "(VK_EXT_extended_dynamic_state3)": [
@@ -36745,14 +36567,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdDrawIndirectCount-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdDrawIndirectCount-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdDrawIndirectCount-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -36773,8 +36587,8 @@
           "text": " The subpass index of the current render pass <strong class=\"purple\">must</strong> be equal to the <code>subpass</code> member of the <code>VkGraphicsPipelineCreateInfo</code> structure specified when creating the <code>VkPipeline</code> bound to <code>VK_PIPELINE_BIND_POINT_GRAPHICS</code>"
         },
         {
-          "vuid": "VUID-vkCmdDrawIndirectCount-None-07748",
-          "text": " If any shader statically accesses an input attachment, a valid descriptor <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
+          "vuid": "VUID-vkCmdDrawIndirectCount-None-02686",
+          "text": " Every input attachment used by the current subpass <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
         },
         {
           "vuid": "VUID-vkCmdDrawIndirectCount-OpTypeImage-07468",
@@ -36782,7 +36596,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawIndirectCount-None-07469",
-          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition, and be created with a <a href=\"#VkImageView\">VkImageView</a> that is compatible with the attachment referenced by the subpass' <code>pInputAttachments</code>[<code>InputAttachmentIndex</code>] in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> as specified by <a href=\"#compatibility-inputattachment\">Fragment Input Attachment Compatibility</a>"
+          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition be created with a <a href=\"#VkImageView\">VkImageView</a> that is an attachment in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> at an index that corresponds to a valid input attachment in the current subpass"
         },
         {
           "vuid": "VUID-vkCmdDrawIndirectCount-None-06537",
@@ -36904,7 +36718,7 @@
       "(VK_VERSION_1_2,VK_KHR_draw_indirect_count)+!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdDrawIndirectCount-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_VERSION_1_2,VK_KHR_draw_indirect_count)+(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -36994,7 +36808,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawIndirectCount-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "(VK_VERSION_1_2,VK_KHR_draw_indirect_count)+!(VK_EXT_pipeline_robustness)": [
@@ -37086,15 +36900,15 @@
         },
         {
           "vuid": "VUID-vkCmdDrawIndirectCount-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdDrawIndirectCount-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdDrawIndirectCount-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ],
       "(VK_VERSION_1_2,VK_KHR_draw_indirect_count)+(VK_VERSION_1_1,VK_KHR_multiview)": [
@@ -37261,18 +37075,12 @@
       ],
       "(VK_VERSION_1_2,VK_KHR_draw_indirect_count)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_color_write_enable)": [
         {
-          "vuid": "VUID-vkCmdDrawIndirectCount-None-07749",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawIndirectCount-attachmentCount-06667",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
         },
         {
-          "vuid": "VUID-vkCmdDrawIndirectCount-attachmentCount-07750",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
-        }
-      ],
-      "(VK_VERSION_1_2,VK_KHR_draw_indirect_count)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_discard_rectangles)": [
-        {
-          "vuid": "VUID-vkCmdDrawIndirectCount-None-07751",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetDiscardRectangleEXT\">vkCmdSetDiscardRectangleEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawIndirectCount-attachmentCount-06815",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be less than or equal to the <code>maxColorAttachments</code> member of <code>VkPhysicalDeviceLimits</code>"
         }
       ],
       "(VK_VERSION_1_2,VK_KHR_draw_indirect_count)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_KHR_fragment_shading_rate)": [
@@ -37336,13 +37144,13 @@
       "(VK_VERSION_1_2,VK_KHR_draw_indirect_count)+(VK_EXT_primitives_generated_query)": [
         {
           "vuid": "VUID-vkCmdDrawIndirectCount-primitivesGeneratedQueryWithRasterizerDiscard-06708",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled."
         }
       ],
       "(VK_VERSION_1_2,VK_KHR_draw_indirect_count)+(VK_EXT_primitives_generated_query)+(VK_EXT_transform_feedback)": [
         {
           "vuid": "VUID-vkCmdDrawIndirectCount-primitivesGeneratedQueryWithNonZeroStreams-06709",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>."
         }
       ],
       "(VK_VERSION_1_2,VK_KHR_draw_indirect_count)+(VK_EXT_extended_dynamic_state3)": [
@@ -37729,14 +37537,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdDrawIndexedIndirect-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdDrawIndexedIndirect-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdDrawIndexedIndirect-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -37757,8 +37557,8 @@
           "text": " The subpass index of the current render pass <strong class=\"purple\">must</strong> be equal to the <code>subpass</code> member of the <code>VkGraphicsPipelineCreateInfo</code> structure specified when creating the <code>VkPipeline</code> bound to <code>VK_PIPELINE_BIND_POINT_GRAPHICS</code>"
         },
         {
-          "vuid": "VUID-vkCmdDrawIndexedIndirect-None-07748",
-          "text": " If any shader statically accesses an input attachment, a valid descriptor <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
+          "vuid": "VUID-vkCmdDrawIndexedIndirect-None-02686",
+          "text": " Every input attachment used by the current subpass <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
         },
         {
           "vuid": "VUID-vkCmdDrawIndexedIndirect-OpTypeImage-07468",
@@ -37766,7 +37566,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawIndexedIndirect-None-07469",
-          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition, and be created with a <a href=\"#VkImageView\">VkImageView</a> that is compatible with the attachment referenced by the subpass' <code>pInputAttachments</code>[<code>InputAttachmentIndex</code>] in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> as specified by <a href=\"#compatibility-inputattachment\">Fragment Input Attachment Compatibility</a>"
+          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition be created with a <a href=\"#VkImageView\">VkImageView</a> that is an attachment in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> at an index that corresponds to a valid input attachment in the current subpass"
         },
         {
           "vuid": "VUID-vkCmdDrawIndexedIndirect-None-06537",
@@ -37872,7 +37672,7 @@
       "!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdDrawIndexedIndirect-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -37962,7 +37762,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawIndexedIndirect-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "!(VK_EXT_pipeline_robustness)": [
@@ -38054,15 +37854,15 @@
         },
         {
           "vuid": "VUID-vkCmdDrawIndexedIndirect-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdDrawIndexedIndirect-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdDrawIndexedIndirect-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ],
       "(VK_VERSION_1_1,VK_KHR_multiview)": [
@@ -38229,18 +38029,12 @@
       ],
       "(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_color_write_enable)": [
         {
-          "vuid": "VUID-vkCmdDrawIndexedIndirect-None-07749",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawIndexedIndirect-attachmentCount-06667",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
         },
         {
-          "vuid": "VUID-vkCmdDrawIndexedIndirect-attachmentCount-07750",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
-        }
-      ],
-      "(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_discard_rectangles)": [
-        {
-          "vuid": "VUID-vkCmdDrawIndexedIndirect-None-07751",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetDiscardRectangleEXT\">vkCmdSetDiscardRectangleEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawIndexedIndirect-attachmentCount-06815",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be less than or equal to the <code>maxColorAttachments</code> member of <code>VkPhysicalDeviceLimits</code>"
         }
       ],
       "(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_KHR_fragment_shading_rate)": [
@@ -38304,13 +38098,13 @@
       "(VK_EXT_primitives_generated_query)": [
         {
           "vuid": "VUID-vkCmdDrawIndexedIndirect-primitivesGeneratedQueryWithRasterizerDiscard-06708",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled."
         }
       ],
       "(VK_EXT_primitives_generated_query)+(VK_EXT_transform_feedback)": [
         {
           "vuid": "VUID-vkCmdDrawIndexedIndirect-primitivesGeneratedQueryWithNonZeroStreams-06709",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>."
         }
       ],
       "(VK_EXT_extended_dynamic_state3)": [
@@ -38707,14 +38501,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdDrawIndexedIndirectCount-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdDrawIndexedIndirectCount-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdDrawIndexedIndirectCount-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -38735,8 +38521,8 @@
           "text": " The subpass index of the current render pass <strong class=\"purple\">must</strong> be equal to the <code>subpass</code> member of the <code>VkGraphicsPipelineCreateInfo</code> structure specified when creating the <code>VkPipeline</code> bound to <code>VK_PIPELINE_BIND_POINT_GRAPHICS</code>"
         },
         {
-          "vuid": "VUID-vkCmdDrawIndexedIndirectCount-None-07748",
-          "text": " If any shader statically accesses an input attachment, a valid descriptor <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
+          "vuid": "VUID-vkCmdDrawIndexedIndirectCount-None-02686",
+          "text": " Every input attachment used by the current subpass <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
         },
         {
           "vuid": "VUID-vkCmdDrawIndexedIndirectCount-OpTypeImage-07468",
@@ -38744,7 +38530,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawIndexedIndirectCount-None-07469",
-          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition, and be created with a <a href=\"#VkImageView\">VkImageView</a> that is compatible with the attachment referenced by the subpass' <code>pInputAttachments</code>[<code>InputAttachmentIndex</code>] in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> as specified by <a href=\"#compatibility-inputattachment\">Fragment Input Attachment Compatibility</a>"
+          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition be created with a <a href=\"#VkImageView\">VkImageView</a> that is an attachment in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> at an index that corresponds to a valid input attachment in the current subpass"
         },
         {
           "vuid": "VUID-vkCmdDrawIndexedIndirectCount-None-06537",
@@ -38870,7 +38656,7 @@
       "(VK_VERSION_1_2,VK_KHR_draw_indirect_count)+!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdDrawIndexedIndirectCount-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_VERSION_1_2,VK_KHR_draw_indirect_count)+(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -38960,7 +38746,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawIndexedIndirectCount-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "(VK_VERSION_1_2,VK_KHR_draw_indirect_count)+!(VK_EXT_pipeline_robustness)": [
@@ -39052,15 +38838,15 @@
         },
         {
           "vuid": "VUID-vkCmdDrawIndexedIndirectCount-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdDrawIndexedIndirectCount-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdDrawIndexedIndirectCount-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ],
       "(VK_VERSION_1_2,VK_KHR_draw_indirect_count)+(VK_VERSION_1_1,VK_KHR_multiview)": [
@@ -39227,18 +39013,12 @@
       ],
       "(VK_VERSION_1_2,VK_KHR_draw_indirect_count)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_color_write_enable)": [
         {
-          "vuid": "VUID-vkCmdDrawIndexedIndirectCount-None-07749",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawIndexedIndirectCount-attachmentCount-06667",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
         },
         {
-          "vuid": "VUID-vkCmdDrawIndexedIndirectCount-attachmentCount-07750",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
-        }
-      ],
-      "(VK_VERSION_1_2,VK_KHR_draw_indirect_count)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_discard_rectangles)": [
-        {
-          "vuid": "VUID-vkCmdDrawIndexedIndirectCount-None-07751",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetDiscardRectangleEXT\">vkCmdSetDiscardRectangleEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawIndexedIndirectCount-attachmentCount-06815",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be less than or equal to the <code>maxColorAttachments</code> member of <code>VkPhysicalDeviceLimits</code>"
         }
       ],
       "(VK_VERSION_1_2,VK_KHR_draw_indirect_count)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_KHR_fragment_shading_rate)": [
@@ -39302,13 +39082,13 @@
       "(VK_VERSION_1_2,VK_KHR_draw_indirect_count)+(VK_EXT_primitives_generated_query)": [
         {
           "vuid": "VUID-vkCmdDrawIndexedIndirectCount-primitivesGeneratedQueryWithRasterizerDiscard-06708",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled."
         }
       ],
       "(VK_VERSION_1_2,VK_KHR_draw_indirect_count)+(VK_EXT_primitives_generated_query)+(VK_EXT_transform_feedback)": [
         {
           "vuid": "VUID-vkCmdDrawIndexedIndirectCount-primitivesGeneratedQueryWithNonZeroStreams-06709",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>."
         }
       ],
       "(VK_VERSION_1_2,VK_KHR_draw_indirect_count)+(VK_EXT_extended_dynamic_state3)": [
@@ -39695,14 +39475,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdDrawIndirectByteCountEXT-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdDrawIndirectByteCountEXT-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdDrawIndirectByteCountEXT-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -39723,8 +39495,8 @@
           "text": " The subpass index of the current render pass <strong class=\"purple\">must</strong> be equal to the <code>subpass</code> member of the <code>VkGraphicsPipelineCreateInfo</code> structure specified when creating the <code>VkPipeline</code> bound to <code>VK_PIPELINE_BIND_POINT_GRAPHICS</code>"
         },
         {
-          "vuid": "VUID-vkCmdDrawIndirectByteCountEXT-None-07748",
-          "text": " If any shader statically accesses an input attachment, a valid descriptor <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
+          "vuid": "VUID-vkCmdDrawIndirectByteCountEXT-None-02686",
+          "text": " Every input attachment used by the current subpass <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
         },
         {
           "vuid": "VUID-vkCmdDrawIndirectByteCountEXT-OpTypeImage-07468",
@@ -39732,7 +39504,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawIndirectByteCountEXT-None-07469",
-          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition, and be created with a <a href=\"#VkImageView\">VkImageView</a> that is compatible with the attachment referenced by the subpass' <code>pInputAttachments</code>[<code>InputAttachmentIndex</code>] in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> as specified by <a href=\"#compatibility-inputattachment\">Fragment Input Attachment Compatibility</a>"
+          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition be created with a <a href=\"#VkImageView\">VkImageView</a> that is an attachment in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> at an index that corresponds to a valid input attachment in the current subpass"
         },
         {
           "vuid": "VUID-vkCmdDrawIndirectByteCountEXT-None-06537",
@@ -39826,7 +39598,7 @@
       "(VK_EXT_transform_feedback)+!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdDrawIndirectByteCountEXT-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_EXT_transform_feedback)+(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -39916,7 +39688,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawIndirectByteCountEXT-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "(VK_EXT_transform_feedback)+!(VK_EXT_pipeline_robustness)": [
@@ -40008,15 +39780,15 @@
         },
         {
           "vuid": "VUID-vkCmdDrawIndirectByteCountEXT-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdDrawIndirectByteCountEXT-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdDrawIndirectByteCountEXT-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ],
       "(VK_EXT_transform_feedback)+(VK_VERSION_1_1,VK_KHR_multiview)": [
@@ -40183,18 +39955,12 @@
       ],
       "(VK_EXT_transform_feedback)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_color_write_enable)": [
         {
-          "vuid": "VUID-vkCmdDrawIndirectByteCountEXT-None-07749",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawIndirectByteCountEXT-attachmentCount-06667",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
         },
         {
-          "vuid": "VUID-vkCmdDrawIndirectByteCountEXT-attachmentCount-07750",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
-        }
-      ],
-      "(VK_EXT_transform_feedback)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_discard_rectangles)": [
-        {
-          "vuid": "VUID-vkCmdDrawIndirectByteCountEXT-None-07751",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetDiscardRectangleEXT\">vkCmdSetDiscardRectangleEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawIndirectByteCountEXT-attachmentCount-06815",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be less than or equal to the <code>maxColorAttachments</code> member of <code>VkPhysicalDeviceLimits</code>"
         }
       ],
       "(VK_EXT_transform_feedback)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_KHR_fragment_shading_rate)": [
@@ -40258,13 +40024,13 @@
       "(VK_EXT_transform_feedback)+(VK_EXT_primitives_generated_query)": [
         {
           "vuid": "VUID-vkCmdDrawIndirectByteCountEXT-primitivesGeneratedQueryWithRasterizerDiscard-06708",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled."
         }
       ],
       "(VK_EXT_transform_feedback)+(VK_EXT_primitives_generated_query)+(VK_EXT_transform_feedback)": [
         {
           "vuid": "VUID-vkCmdDrawIndirectByteCountEXT-primitivesGeneratedQueryWithNonZeroStreams-06709",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>."
         }
       ],
       "(VK_EXT_transform_feedback)+(VK_EXT_extended_dynamic_state3)": [
@@ -40741,14 +40507,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksNV-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdDrawMeshTasksNV-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdDrawMeshTasksNV-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -40769,8 +40527,8 @@
           "text": " The subpass index of the current render pass <strong class=\"purple\">must</strong> be equal to the <code>subpass</code> member of the <code>VkGraphicsPipelineCreateInfo</code> structure specified when creating the <code>VkPipeline</code> bound to <code>VK_PIPELINE_BIND_POINT_GRAPHICS</code>"
         },
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksNV-None-07748",
-          "text": " If any shader statically accesses an input attachment, a valid descriptor <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
+          "vuid": "VUID-vkCmdDrawMeshTasksNV-None-02686",
+          "text": " Every input attachment used by the current subpass <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksNV-OpTypeImage-07468",
@@ -40778,7 +40536,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksNV-None-07469",
-          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition, and be created with a <a href=\"#VkImageView\">VkImageView</a> that is compatible with the attachment referenced by the subpass' <code>pInputAttachments</code>[<code>InputAttachmentIndex</code>] in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> as specified by <a href=\"#compatibility-inputattachment\">Fragment Input Attachment Compatibility</a>"
+          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition be created with a <a href=\"#VkImageView\">VkImageView</a> that is an attachment in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> at an index that corresponds to a valid input attachment in the current subpass"
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksNV-None-06537",
@@ -40810,7 +40568,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksNV-MeshNV-07080",
-          "text": " The current pipeline bound to <code>VK_PIPELINE_BIND_POINT_GRAPHICS</code> <strong class=\"purple\">must</strong> contain a shader stage using the <code>MeshNV</code> {ExecutionModel}"
+          "text": " The current pipeline bound to <code>VK_PIPELINE_BIND_POINT_GRAPHICS</code> <strong class=\"purple\">must</strong> contain a shader stage using the <code>MeshNV</code> {ExecutionModel}."
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksNV-commandBuffer-parameter",
@@ -40836,7 +40594,7 @@
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdDrawMeshTasksNV-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -40926,7 +40684,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksNV-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+!(VK_EXT_pipeline_robustness)": [
@@ -41014,15 +40772,15 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksNV-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksNV-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksNV-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_VERSION_1_1,VK_KHR_multiview)": [
@@ -41185,18 +40943,12 @@
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_color_write_enable)": [
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksNV-None-07749",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawMeshTasksNV-attachmentCount-06667",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
         },
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksNV-attachmentCount-07750",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
-        }
-      ],
-      "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_discard_rectangles)": [
-        {
-          "vuid": "VUID-vkCmdDrawMeshTasksNV-None-07751",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetDiscardRectangleEXT\">vkCmdSetDiscardRectangleEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawMeshTasksNV-attachmentCount-06815",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be less than or equal to the <code>maxColorAttachments</code> member of <code>VkPhysicalDeviceLimits</code>"
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_KHR_fragment_shading_rate)": [
@@ -41260,13 +41012,13 @@
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_EXT_primitives_generated_query)": [
         {
           "vuid": "VUID-vkCmdDrawMeshTasksNV-primitivesGeneratedQueryWithRasterizerDiscard-06708",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_EXT_primitives_generated_query)+(VK_EXT_transform_feedback)": [
         {
           "vuid": "VUID-vkCmdDrawMeshTasksNV-primitivesGeneratedQueryWithNonZeroStreams-06709",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_EXT_extended_dynamic_state3)": [
@@ -41623,14 +41375,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectNV-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectNV-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectNV-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -41651,8 +41395,8 @@
           "text": " The subpass index of the current render pass <strong class=\"purple\">must</strong> be equal to the <code>subpass</code> member of the <code>VkGraphicsPipelineCreateInfo</code> structure specified when creating the <code>VkPipeline</code> bound to <code>VK_PIPELINE_BIND_POINT_GRAPHICS</code>"
         },
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectNV-None-07748",
-          "text": " If any shader statically accesses an input attachment, a valid descriptor <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
+          "vuid": "VUID-vkCmdDrawMeshTasksIndirectNV-None-02686",
+          "text": " Every input attachment used by the current subpass <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectNV-OpTypeImage-07468",
@@ -41660,7 +41404,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectNV-None-07469",
-          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition, and be created with a <a href=\"#VkImageView\">VkImageView</a> that is compatible with the attachment referenced by the subpass' <code>pInputAttachments</code>[<code>InputAttachmentIndex</code>] in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> as specified by <a href=\"#compatibility-inputattachment\">Fragment Input Attachment Compatibility</a>"
+          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition be created with a <a href=\"#VkImageView\">VkImageView</a> that is an attachment in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> at an index that corresponds to a valid input attachment in the current subpass"
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectNV-None-06537",
@@ -41720,7 +41464,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectNV-MeshNV-07081",
-          "text": " The current pipeline bound to <code>VK_PIPELINE_BIND_POINT_GRAPHICS</code> <strong class=\"purple\">must</strong> contain a shader stage using the <code>MeshNV</code> {ExecutionModel}"
+          "text": " The current pipeline bound to <code>VK_PIPELINE_BIND_POINT_GRAPHICS</code> <strong class=\"purple\">must</strong> contain a shader stage using the <code>MeshNV</code> {ExecutionModel}."
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectNV-commandBuffer-parameter",
@@ -41754,7 +41498,7 @@
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectNV-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -41844,7 +41588,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectNV-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+!(VK_EXT_pipeline_robustness)": [
@@ -41936,15 +41680,15 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectNV-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectNV-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectNV-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_VERSION_1_1,VK_KHR_multiview)": [
@@ -42107,18 +41851,12 @@
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_color_write_enable)": [
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectNV-None-07749",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawMeshTasksIndirectNV-attachmentCount-06667",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
         },
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectNV-attachmentCount-07750",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
-        }
-      ],
-      "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_discard_rectangles)": [
-        {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectNV-None-07751",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetDiscardRectangleEXT\">vkCmdSetDiscardRectangleEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawMeshTasksIndirectNV-attachmentCount-06815",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be less than or equal to the <code>maxColorAttachments</code> member of <code>VkPhysicalDeviceLimits</code>"
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_KHR_fragment_shading_rate)": [
@@ -42182,13 +41920,13 @@
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_EXT_primitives_generated_query)": [
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectNV-primitivesGeneratedQueryWithRasterizerDiscard-06708",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_EXT_primitives_generated_query)+(VK_EXT_transform_feedback)": [
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectNV-primitivesGeneratedQueryWithNonZeroStreams-06709",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_EXT_extended_dynamic_state3)": [
@@ -42553,14 +42291,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountNV-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountNV-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountNV-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -42581,8 +42311,8 @@
           "text": " The subpass index of the current render pass <strong class=\"purple\">must</strong> be equal to the <code>subpass</code> member of the <code>VkGraphicsPipelineCreateInfo</code> structure specified when creating the <code>VkPipeline</code> bound to <code>VK_PIPELINE_BIND_POINT_GRAPHICS</code>"
         },
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountNV-None-07748",
-          "text": " If any shader statically accesses an input attachment, a valid descriptor <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
+          "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountNV-None-02686",
+          "text": " Every input attachment used by the current subpass <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountNV-OpTypeImage-07468",
@@ -42590,7 +42320,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountNV-None-07469",
-          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition, and be created with a <a href=\"#VkImageView\">VkImageView</a> that is compatible with the attachment referenced by the subpass' <code>pInputAttachments</code>[<code>InputAttachmentIndex</code>] in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> as specified by <a href=\"#compatibility-inputattachment\">Fragment Input Attachment Compatibility</a>"
+          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition be created with a <a href=\"#VkImageView\">VkImageView</a> that is an attachment in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> at an index that corresponds to a valid input attachment in the current subpass"
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountNV-None-06537",
@@ -42666,7 +42396,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountNV-MeshNV-07082",
-          "text": " The current pipeline bound to <code>VK_PIPELINE_BIND_POINT_GRAPHICS</code> <strong class=\"purple\">must</strong> contain a shader stage using the <code>MeshNV</code> {ExecutionModel}"
+          "text": " The current pipeline bound to <code>VK_PIPELINE_BIND_POINT_GRAPHICS</code> <strong class=\"purple\">must</strong> contain a shader stage using the <code>MeshNV</code> {ExecutionModel}."
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountNV-commandBuffer-parameter",
@@ -42704,7 +42434,7 @@
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountNV-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -42794,7 +42524,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountNV-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+!(VK_EXT_pipeline_robustness)": [
@@ -42886,15 +42616,15 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountNV-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountNV-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountNV-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_VERSION_1_1,VK_KHR_multiview)": [
@@ -43057,18 +42787,12 @@
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_color_write_enable)": [
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountNV-None-07749",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountNV-attachmentCount-06667",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
         },
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountNV-attachmentCount-07750",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
-        }
-      ],
-      "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_discard_rectangles)": [
-        {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountNV-None-07751",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetDiscardRectangleEXT\">vkCmdSetDiscardRectangleEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountNV-attachmentCount-06815",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be less than or equal to the <code>maxColorAttachments</code> member of <code>VkPhysicalDeviceLimits</code>"
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_KHR_fragment_shading_rate)": [
@@ -43132,13 +42856,13 @@
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_EXT_primitives_generated_query)": [
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountNV-primitivesGeneratedQueryWithRasterizerDiscard-06708",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_EXT_primitives_generated_query)+(VK_EXT_transform_feedback)": [
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountNV-primitivesGeneratedQueryWithNonZeroStreams-06709",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_NV_mesh_shader)+(VK_EXT_extended_dynamic_state3)": [
@@ -43501,14 +43225,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksEXT-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdDrawMeshTasksEXT-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdDrawMeshTasksEXT-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -43529,8 +43245,8 @@
           "text": " The subpass index of the current render pass <strong class=\"purple\">must</strong> be equal to the <code>subpass</code> member of the <code>VkGraphicsPipelineCreateInfo</code> structure specified when creating the <code>VkPipeline</code> bound to <code>VK_PIPELINE_BIND_POINT_GRAPHICS</code>"
         },
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksEXT-None-07748",
-          "text": " If any shader statically accesses an input attachment, a valid descriptor <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
+          "vuid": "VUID-vkCmdDrawMeshTasksEXT-None-02686",
+          "text": " Every input attachment used by the current subpass <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksEXT-OpTypeImage-07468",
@@ -43538,7 +43254,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksEXT-None-07469",
-          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition, and be created with a <a href=\"#VkImageView\">VkImageView</a> that is compatible with the attachment referenced by the subpass' <code>pInputAttachments</code>[<code>InputAttachmentIndex</code>] in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> as specified by <a href=\"#compatibility-inputattachment\">Fragment Input Attachment Compatibility</a>"
+          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition be created with a <a href=\"#VkImageView\">VkImageView</a> that is an attachment in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> at an index that corresponds to a valid input attachment in the current subpass"
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksEXT-None-06537",
@@ -43624,7 +43340,7 @@
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdDrawMeshTasksEXT-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -43714,7 +43430,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksEXT-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+!(VK_EXT_pipeline_robustness)": [
@@ -43802,15 +43518,15 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksEXT-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksEXT-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksEXT-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_VERSION_1_1,VK_KHR_multiview)": [
@@ -43973,18 +43689,12 @@
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_color_write_enable)": [
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksEXT-None-07749",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawMeshTasksEXT-attachmentCount-06667",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
         },
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksEXT-attachmentCount-07750",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
-        }
-      ],
-      "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_discard_rectangles)": [
-        {
-          "vuid": "VUID-vkCmdDrawMeshTasksEXT-None-07751",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetDiscardRectangleEXT\">vkCmdSetDiscardRectangleEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawMeshTasksEXT-attachmentCount-06815",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be less than or equal to the <code>maxColorAttachments</code> member of <code>VkPhysicalDeviceLimits</code>"
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_KHR_fragment_shading_rate)": [
@@ -44048,13 +43758,13 @@
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_EXT_primitives_generated_query)": [
         {
           "vuid": "VUID-vkCmdDrawMeshTasksEXT-primitivesGeneratedQueryWithRasterizerDiscard-06708",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_EXT_primitives_generated_query)+(VK_EXT_transform_feedback)": [
         {
           "vuid": "VUID-vkCmdDrawMeshTasksEXT-primitivesGeneratedQueryWithNonZeroStreams-06709",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_EXT_extended_dynamic_state3)": [
@@ -44389,14 +44099,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectEXT-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectEXT-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectEXT-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -44417,8 +44119,8 @@
           "text": " The subpass index of the current render pass <strong class=\"purple\">must</strong> be equal to the <code>subpass</code> member of the <code>VkGraphicsPipelineCreateInfo</code> structure specified when creating the <code>VkPipeline</code> bound to <code>VK_PIPELINE_BIND_POINT_GRAPHICS</code>"
         },
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectEXT-None-07748",
-          "text": " If any shader statically accesses an input attachment, a valid descriptor <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
+          "vuid": "VUID-vkCmdDrawMeshTasksIndirectEXT-None-02686",
+          "text": " Every input attachment used by the current subpass <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectEXT-OpTypeImage-07468",
@@ -44426,7 +44128,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectEXT-None-07469",
-          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition, and be created with a <a href=\"#VkImageView\">VkImageView</a> that is compatible with the attachment referenced by the subpass' <code>pInputAttachments</code>[<code>InputAttachmentIndex</code>] in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> as specified by <a href=\"#compatibility-inputattachment\">Fragment Input Attachment Compatibility</a>"
+          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition be created with a <a href=\"#VkImageView\">VkImageView</a> that is an attachment in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> at an index that corresponds to a valid input attachment in the current subpass"
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectEXT-None-06537",
@@ -44520,7 +44222,7 @@
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectEXT-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -44610,7 +44312,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectEXT-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+!(VK_EXT_pipeline_robustness)": [
@@ -44702,15 +44404,15 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectEXT-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectEXT-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectEXT-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_VERSION_1_1,VK_KHR_multiview)": [
@@ -44873,18 +44575,12 @@
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_color_write_enable)": [
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectEXT-None-07749",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawMeshTasksIndirectEXT-attachmentCount-06667",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
         },
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectEXT-attachmentCount-07750",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
-        }
-      ],
-      "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_discard_rectangles)": [
-        {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectEXT-None-07751",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetDiscardRectangleEXT\">vkCmdSetDiscardRectangleEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawMeshTasksIndirectEXT-attachmentCount-06815",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be less than or equal to the <code>maxColorAttachments</code> member of <code>VkPhysicalDeviceLimits</code>"
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_KHR_fragment_shading_rate)": [
@@ -44948,13 +44644,13 @@
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_EXT_primitives_generated_query)": [
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectEXT-primitivesGeneratedQueryWithRasterizerDiscard-06708",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_EXT_primitives_generated_query)+(VK_EXT_transform_feedback)": [
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectEXT-primitivesGeneratedQueryWithNonZeroStreams-06709",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_EXT_extended_dynamic_state3)": [
@@ -45325,14 +45021,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountEXT-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountEXT-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountEXT-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -45353,8 +45041,8 @@
           "text": " The subpass index of the current render pass <strong class=\"purple\">must</strong> be equal to the <code>subpass</code> member of the <code>VkGraphicsPipelineCreateInfo</code> structure specified when creating the <code>VkPipeline</code> bound to <code>VK_PIPELINE_BIND_POINT_GRAPHICS</code>"
         },
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountEXT-None-07748",
-          "text": " If any shader statically accesses an input attachment, a valid descriptor <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
+          "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountEXT-None-02686",
+          "text": " Every input attachment used by the current subpass <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountEXT-OpTypeImage-07468",
@@ -45362,7 +45050,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountEXT-None-07469",
-          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition, and be created with a <a href=\"#VkImageView\">VkImageView</a> that is compatible with the attachment referenced by the subpass' <code>pInputAttachments</code>[<code>InputAttachmentIndex</code>] in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> as specified by <a href=\"#compatibility-inputattachment\">Fragment Input Attachment Compatibility</a>"
+          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition be created with a <a href=\"#VkImageView\">VkImageView</a> that is an attachment in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> at an index that corresponds to a valid input attachment in the current subpass"
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountEXT-None-06537",
@@ -45476,7 +45164,7 @@
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountEXT-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -45566,7 +45254,7 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountEXT-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+!(VK_EXT_pipeline_robustness)": [
@@ -45658,15 +45346,15 @@
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountEXT-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountEXT-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountEXT-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_VERSION_1_1,VK_KHR_multiview)": [
@@ -45829,18 +45517,12 @@
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_color_write_enable)": [
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountEXT-None-07749",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountEXT-attachmentCount-06667",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
         },
         {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountEXT-attachmentCount-07750",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
-        }
-      ],
-      "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_discard_rectangles)": [
-        {
-          "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountEXT-None-07751",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetDiscardRectangleEXT\">vkCmdSetDiscardRectangleEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountEXT-attachmentCount-06815",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be less than or equal to the <code>maxColorAttachments</code> member of <code>VkPhysicalDeviceLimits</code>"
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_KHR_fragment_shading_rate)": [
@@ -45904,13 +45586,13 @@
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_EXT_primitives_generated_query)": [
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountEXT-primitivesGeneratedQueryWithRasterizerDiscard-06708",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_EXT_primitives_generated_query)+(VK_EXT_transform_feedback)": [
         {
           "vuid": "VUID-vkCmdDrawMeshTasksIndirectCountEXT-primitivesGeneratedQueryWithNonZeroStreams-06709",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>."
         }
       ],
       "(VK_NV_mesh_shader,VK_EXT_mesh_shader)+(VK_EXT_mesh_shader)+(VK_EXT_extended_dynamic_state3)": [
@@ -46466,7 +46148,7 @@
         },
         {
           "vuid": "VUID-vkCmdBindVertexBuffers-pOffsets-parameter",
-          "text": " <code>pOffsets</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>bindingCount</code> <a href=\"#VkDeviceSize\">VkDeviceSize</a> values"
+          "text": " <code>pOffsets</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>bindingCount</code> <code>VkDeviceSize</code> values"
         },
         {
           "vuid": "VUID-vkCmdBindVertexBuffers-commandBuffer-recording",
@@ -46544,15 +46226,15 @@
         },
         {
           "vuid": "VUID-vkCmdBindVertexBuffers2-pOffsets-parameter",
-          "text": " <code>pOffsets</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>bindingCount</code> <a href=\"#VkDeviceSize\">VkDeviceSize</a> values"
+          "text": " <code>pOffsets</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>bindingCount</code> <code>VkDeviceSize</code> values"
         },
         {
           "vuid": "VUID-vkCmdBindVertexBuffers2-pSizes-parameter",
-          "text": " If <code>pSizes</code> is not <code>NULL</code>, <code>pSizes</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>bindingCount</code> <a href=\"#VkDeviceSize\">VkDeviceSize</a> values"
+          "text": " If <code>pSizes</code> is not <code>NULL</code>, <code>pSizes</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>bindingCount</code> <code>VkDeviceSize</code> values"
         },
         {
           "vuid": "VUID-vkCmdBindVertexBuffers2-pStrides-parameter",
-          "text": " If <code>pStrides</code> is not <code>NULL</code>, <code>pStrides</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>bindingCount</code> <a href=\"#VkDeviceSize\">VkDeviceSize</a> values"
+          "text": " If <code>pStrides</code> is not <code>NULL</code>, <code>pStrides</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>bindingCount</code> <code>VkDeviceSize</code> values"
         },
         {
           "vuid": "VUID-vkCmdBindVertexBuffers2-commandBuffer-recording",
@@ -46742,7 +46424,7 @@
         },
         {
           "vuid": "VUID-vkCmdBindTransformFeedbackBuffersEXT-pOffsets-parameter",
-          "text": " <code>pOffsets</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>bindingCount</code> <a href=\"#VkDeviceSize\">VkDeviceSize</a> values"
+          "text": " <code>pOffsets</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>bindingCount</code> <code>VkDeviceSize</code> values"
         },
         {
           "vuid": "VUID-vkCmdBindTransformFeedbackBuffersEXT-commandBuffer-recording",
@@ -46814,7 +46496,7 @@
         },
         {
           "vuid": "VUID-vkCmdBeginTransformFeedbackEXT-pCounterBufferOffsets-parameter",
-          "text": " If <code>counterBufferCount</code> is not <code>0</code>, and <code>pCounterBufferOffsets</code> is not <code>NULL</code>, <code>pCounterBufferOffsets</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>counterBufferCount</code> <a href=\"#VkDeviceSize\">VkDeviceSize</a> values"
+          "text": " If <code>counterBufferCount</code> is not <code>0</code>, and <code>pCounterBufferOffsets</code> is not <code>NULL</code>, <code>pCounterBufferOffsets</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>counterBufferCount</code> <code>VkDeviceSize</code> values"
         },
         {
           "vuid": "VUID-vkCmdBeginTransformFeedbackEXT-commandBuffer-recording",
@@ -46884,7 +46566,7 @@
         },
         {
           "vuid": "VUID-vkCmdEndTransformFeedbackEXT-pCounterBufferOffsets-parameter",
-          "text": " If <code>counterBufferCount</code> is not <code>0</code>, and <code>pCounterBufferOffsets</code> is not <code>NULL</code>, <code>pCounterBufferOffsets</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>counterBufferCount</code> <a href=\"#VkDeviceSize\">VkDeviceSize</a> values"
+          "text": " If <code>counterBufferCount</code> is not <code>0</code>, and <code>pCounterBufferOffsets</code> is not <code>NULL</code>, <code>pCounterBufferOffsets</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>counterBufferCount</code> <code>VkDeviceSize</code> values"
         },
         {
           "vuid": "VUID-vkCmdEndTransformFeedbackEXT-commandBuffer-recording",
@@ -47606,7 +47288,7 @@
         },
         {
           "vuid": "VUID-VkPipelineMultisampleStateCreateInfo-pSampleMask-parameter",
-          "text": " If <code>pSampleMask</code> is not <code>NULL</code>, <code>pSampleMask</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of \\(\\lceil{\\mathit{rasterizationSamples} \\over 32}\\rceil\\) <a href=\"#VkSampleMask\">VkSampleMask</a> values"
+          "text": " If <code>pSampleMask</code> is not <code>NULL</code>, <code>pSampleMask</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of \\(\\lceil{\\mathit{rasterizationSamples} \\over 32}\\rceil\\) <code>VkSampleMask</code> values"
         }
       ],
       "(VK_NV_framebuffer_mixed_samples)": [
@@ -48886,7 +48568,7 @@
         },
         {
           "vuid": "VUID-vkCmdSetSampleMaskEXT-pSampleMask-parameter",
-          "text": " <code>pSampleMask</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of \\(\\lceil{\\mathit{samples} \\over 32}\\rceil\\) <a href=\"#VkSampleMask\">VkSampleMask</a> values"
+          "text": " <code>pSampleMask</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of \\(\\lceil{\\mathit{samples} \\over 32}\\rceil\\) <code>VkSampleMask</code> values"
         },
         {
           "vuid": "VUID-vkCmdSetSampleMaskEXT-commandBuffer-recording",
@@ -49748,7 +49430,7 @@
         },
         {
           "vuid": "VUID-vkCmdSetColorBlendEnableEXT-pColorBlendEnables-parameter",
-          "text": " <code>pColorBlendEnables</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>attachmentCount</code> <a href=\"#VkBool32\">VkBool32</a> values"
+          "text": " <code>pColorBlendEnables</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>attachmentCount</code> <code>VkBool32</code> values"
         },
         {
           "vuid": "VUID-vkCmdSetColorBlendEnableEXT-commandBuffer-recording",
@@ -50064,7 +49746,7 @@
         },
         {
           "vuid": "VUID-VkPipelineColorWriteCreateInfoEXT-pColorWriteEnables-parameter",
-          "text": " If <code>attachmentCount</code> is not <code>0</code>, <code>pColorWriteEnables</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>attachmentCount</code> <a href=\"#VkBool32\">VkBool32</a> values"
+          "text": " If <code>attachmentCount</code> is not <code>0</code>, <code>pColorWriteEnables</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>attachmentCount</code> <code>VkBool32</code> values"
         }
       ],
       "(VK_EXT_color_write_enable)+(VK_EXT_extended_dynamic_state3)": [
@@ -50096,7 +49778,7 @@
         },
         {
           "vuid": "VUID-vkCmdSetColorWriteEnableEXT-pColorWriteEnables-parameter",
-          "text": " <code>pColorWriteEnables</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>attachmentCount</code> <a href=\"#VkBool32\">VkBool32</a> values"
+          "text": " <code>pColorWriteEnables</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>attachmentCount</code> <code>VkBool32</code> values"
         },
         {
           "vuid": "VUID-vkCmdSetColorWriteEnableEXT-commandBuffer-recording",
@@ -50183,14 +49865,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdDispatch-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdDispatch-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdDispatch-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -50238,7 +49912,7 @@
       "!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdDispatch-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -50328,7 +50002,7 @@
         },
         {
           "vuid": "VUID-vkCmdDispatch-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "!(VK_EXT_pipeline_robustness)": [
@@ -50424,15 +50098,15 @@
         },
         {
           "vuid": "VUID-vkCmdDispatch-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdDispatch-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdDispatch-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ],
       "(VK_VERSION_1_1)+(VK_KHR_ray_query)": [
@@ -50485,14 +50159,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdDispatchIndirect-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdDispatchIndirect-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdDispatchIndirect-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -50552,7 +50218,7 @@
       "!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdDispatchIndirect-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -50642,7 +50308,7 @@
         },
         {
           "vuid": "VUID-vkCmdDispatchIndirect-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "!(VK_EXT_pipeline_robustness)": [
@@ -50734,15 +50400,15 @@
         },
         {
           "vuid": "VUID-vkCmdDispatchIndirect-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdDispatchIndirect-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdDispatchIndirect-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ]
     },
@@ -50805,14 +50471,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdDispatchBase-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdDispatchBase-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdDispatchBase-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -50876,7 +50534,7 @@
       "(VK_VERSION_1_1,VK_KHR_device_group)+!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdDispatchBase-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_VERSION_1_1,VK_KHR_device_group)+(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -50966,7 +50624,7 @@
         },
         {
           "vuid": "VUID-vkCmdDispatchBase-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "(VK_VERSION_1_1,VK_KHR_device_group)+!(VK_EXT_pipeline_robustness)": [
@@ -51062,15 +50720,15 @@
         },
         {
           "vuid": "VUID-vkCmdDispatchBase-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdDispatchBase-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdDispatchBase-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ],
       "(VK_VERSION_1_1,VK_KHR_device_group)+(VK_VERSION_1_1)+(VK_KHR_ray_query)": [
@@ -51123,14 +50781,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdSubpassShadingHUAWEI-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdSubpassShadingHUAWEI-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdSubpassShadingHUAWEI-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -51170,7 +50820,7 @@
       "(VK_HUAWEI_subpass_shading)+!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdSubpassShadingHUAWEI-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_HUAWEI_subpass_shading)+(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -51260,7 +50910,7 @@
         },
         {
           "vuid": "VUID-vkCmdSubpassShadingHUAWEI-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "(VK_HUAWEI_subpass_shading)+!(VK_EXT_pipeline_robustness)": [
@@ -51348,15 +50998,15 @@
         },
         {
           "vuid": "VUID-vkCmdSubpassShadingHUAWEI-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdSubpassShadingHUAWEI-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdSubpassShadingHUAWEI-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ]
     },
@@ -51731,14 +51381,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdExecuteGeneratedCommandsNV-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdExecuteGeneratedCommandsNV-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdExecuteGeneratedCommandsNV-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -51759,8 +51401,8 @@
           "text": " The subpass index of the current render pass <strong class=\"purple\">must</strong> be equal to the <code>subpass</code> member of the <code>VkGraphicsPipelineCreateInfo</code> structure specified when creating the <code>VkPipeline</code> bound to <code>VK_PIPELINE_BIND_POINT_GRAPHICS</code>"
         },
         {
-          "vuid": "VUID-vkCmdExecuteGeneratedCommandsNV-None-07748",
-          "text": " If any shader statically accesses an input attachment, a valid descriptor <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
+          "vuid": "VUID-vkCmdExecuteGeneratedCommandsNV-None-02686",
+          "text": " Every input attachment used by the current subpass <strong class=\"purple\">must</strong> be bound to the pipeline via a descriptor set"
         },
         {
           "vuid": "VUID-vkCmdExecuteGeneratedCommandsNV-OpTypeImage-07468",
@@ -51768,7 +51410,7 @@
         },
         {
           "vuid": "VUID-vkCmdExecuteGeneratedCommandsNV-None-07469",
-          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition, and be created with a <a href=\"#VkImageView\">VkImageView</a> that is compatible with the attachment referenced by the subpass' <code>pInputAttachments</code>[<code>InputAttachmentIndex</code>] in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> as specified by <a href=\"#compatibility-inputattachment\">Fragment Input Attachment Compatibility</a>"
+          "text": " Input attachment views accessed in a subpass <strong class=\"purple\">must</strong> be created with the same <a href=\"#VkFormat\">VkFormat</a> as the corresponding subpass definition be created with a <a href=\"#VkImageView\">VkImageView</a> that is an attachment in the currently bound <a href=\"#VkFramebuffer\">VkFramebuffer</a> at an index that corresponds to a valid input attachment in the current subpass"
         },
         {
           "vuid": "VUID-vkCmdExecuteGeneratedCommandsNV-None-06537",
@@ -51846,7 +51488,7 @@
       "(VK_NV_device_generated_commands)+!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdExecuteGeneratedCommandsNV-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_NV_device_generated_commands)+(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -51936,7 +51578,7 @@
         },
         {
           "vuid": "VUID-vkCmdExecuteGeneratedCommandsNV-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "(VK_NV_device_generated_commands)+!(VK_EXT_pipeline_robustness)": [
@@ -52028,15 +51670,15 @@
         },
         {
           "vuid": "VUID-vkCmdExecuteGeneratedCommandsNV-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdExecuteGeneratedCommandsNV-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdExecuteGeneratedCommandsNV-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ],
       "(VK_NV_device_generated_commands)+(VK_VERSION_1_1,VK_KHR_multiview)": [
@@ -52203,18 +51845,12 @@
       ],
       "(VK_NV_device_generated_commands)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_color_write_enable)": [
         {
-          "vuid": "VUID-vkCmdExecuteGeneratedCommandsNV-None-07749",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdExecuteGeneratedCommandsNV-attachmentCount-06667",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
         },
         {
-          "vuid": "VUID-vkCmdExecuteGeneratedCommandsNV-attachmentCount-07750",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be greater than or equal to the <code>VkPipelineColorBlendStateCreateInfo</code>::<code>attachmentCount</code> of the currently bound graphics pipeline"
-        }
-      ],
-      "(VK_NV_device_generated_commands)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_EXT_discard_rectangles)": [
-        {
-          "vuid": "VUID-vkCmdExecuteGeneratedCommandsNV-None-07751",
-          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetDiscardRectangleEXT\">vkCmdSetDiscardRectangleEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command"
+          "vuid": "VUID-vkCmdExecuteGeneratedCommandsNV-attachmentCount-06815",
+          "text": " If the bound graphics pipeline state was created with the <code>VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT</code> dynamic state enabled then <a href=\"#vkCmdSetColorWriteEnableEXT\">vkCmdSetColorWriteEnableEXT</a> <strong class=\"purple\">must</strong> have been called in the current command buffer prior to this drawing command, and the <code>attachmentCount</code> parameter of <code>vkCmdSetColorWriteEnableEXT</code> <strong class=\"purple\">must</strong> be less than or equal to the <code>maxColorAttachments</code> member of <code>VkPhysicalDeviceLimits</code>"
         }
       ],
       "(VK_NV_device_generated_commands)+(VK_VERSION_1_3,VK_KHR_dynamic_rendering)+(VK_KHR_fragment_shading_rate)": [
@@ -52278,13 +51914,13 @@
       "(VK_NV_device_generated_commands)+(VK_EXT_primitives_generated_query)": [
         {
           "vuid": "VUID-vkCmdExecuteGeneratedCommandsNV-primitivesGeneratedQueryWithRasterizerDiscard-06708",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithRasterizerDiscard\"><code>primitivesGeneratedQueryWithRasterizerDiscard</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, <a href=\"#primsrast-discard\">rasterization discard</a> <strong class=\"purple\">must</strong> not be enabled."
         }
       ],
       "(VK_NV_device_generated_commands)+(VK_EXT_primitives_generated_query)+(VK_EXT_transform_feedback)": [
         {
           "vuid": "VUID-vkCmdExecuteGeneratedCommandsNV-primitivesGeneratedQueryWithNonZeroStreams-06709",
-          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>"
+          "text": " If the <a href=\"#features-primitivesGeneratedQueryWithNonZeroStreams\"><code>primitivesGeneratedQueryWithNonZeroStreams</code></a> feature is not enabled and the <code>VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT</code> query is active, the bound graphics pipeline <strong class=\"purple\">must</strong> not have been created with a non-zero value in <code>VkPipelineRasterizationStateStreamCreateInfoEXT</code>::<code>rasterizationStream</code>."
         }
       ],
       "(VK_NV_device_generated_commands)+(VK_EXT_extended_dynamic_state3)": [
@@ -52750,13 +52386,13 @@
       "(VK_NV_device_generated_commands)+(VK_NV_mesh_shader)": [
         {
           "vuid": "VUID-VkGeneratedCommandsInfoNV-indirectCommandsLayout-07078",
-          "text": " If the <code>indirectCommandsLayout</code> uses a token of <code>VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_TASKS_NV</code>, then the <code>pipeline</code> <strong class=\"purple\">must</strong> contain a shader stage using the <code>MeshNV</code> {ExecutionModel}"
+          "text": " If the <code>indirectCommandsLayout</code> uses a token of <code>VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_TASKS_NV</code>, then the <code>pipeline</code> <strong class=\"purple\">must</strong> contain a shader stage using the <code>MeshNV</code> {ExecutionModel}."
         }
       ],
       "(VK_NV_device_generated_commands)+(VK_EXT_mesh_shader)": [
         {
           "vuid": "VUID-VkGeneratedCommandsInfoNV-indirectCommandsLayout-07079",
-          "text": " If the <code>indirectCommandsLayout</code> uses a token of <code>VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_MESH_TASKS_NV</code>, then the <code>pipeline</code> <strong class=\"purple\">must</strong> contain a shader stage using the <code>MeshEXT</code> {ExecutionModel}"
+          "text": " If the <code>indirectCommandsLayout</code> uses a token of <code>VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_MESH_TASKS_NV</code>, then the <code>pipeline</code> <strong class=\"purple\">must</strong> contain a shader stage using the <code>MeshEXT</code> {ExecutionModel}."
         }
       ]
     },
@@ -53342,7 +52978,7 @@
       "(VK_KHR_surface)+(VK_KHR_android_surface)": [
         {
           "vuid": "VUID-VkAndroidSurfaceCreateInfoKHR-window-01248",
-          "text": " <code>window</code> <strong class=\"purple\">must</strong> point to a valid Android <a href=\"#ANativeWindow\">ANativeWindow</a>"
+          "text": " <code>window</code> <strong class=\"purple\">must</strong> point to a valid Android <code>ANativeWindow</code>"
         },
         {
           "vuid": "VUID-VkAndroidSurfaceCreateInfoKHR-sType-sType",
@@ -53682,11 +53318,11 @@
       "(VK_KHR_surface)+(VK_MVK_ios_surface)": [
         {
           "vuid": "VUID-VkIOSSurfaceCreateInfoMVK-pView-04143",
-          "text": " If <code>pView</code> is a <a href=\"#CAMetalLayer\">CAMetalLayer</a> object, it <strong class=\"purple\">must</strong> be a valid <a href=\"#CAMetalLayer\">CAMetalLayer</a>"
+          "text": " If <code>pView</code> is a <code>CAMetalLayer</code> object, it <strong class=\"purple\">must</strong> be a valid <code>CAMetalLayer</code>"
         },
         {
           "vuid": "VUID-VkIOSSurfaceCreateInfoMVK-pView-01316",
-          "text": " If <code>pView</code> is a <code>UIView</code> object, it <strong class=\"purple\">must</strong> be a valid <code>UIView</code>, <strong class=\"purple\">must</strong> be backed by a <code>CALayer</code> object of type <a href=\"#CAMetalLayer\">CAMetalLayer</a>, and <a href=\"#vkCreateIOSSurfaceMVK\">vkCreateIOSSurfaceMVK</a> <strong class=\"purple\">must</strong> be called on the main thread"
+          "text": " If <code>pView</code> is a <code>UIView</code> object, it <strong class=\"purple\">must</strong> be a valid <code>UIView</code>, <strong class=\"purple\">must</strong> be backed by a <code>CALayer</code> object of type <code>CAMetalLayer</code>, and <a href=\"#vkCreateIOSSurfaceMVK\">vkCreateIOSSurfaceMVK</a> <strong class=\"purple\">must</strong> be called on the main thread"
         },
         {
           "vuid": "VUID-VkIOSSurfaceCreateInfoMVK-sType-sType",
@@ -53726,11 +53362,11 @@
       "(VK_KHR_surface)+(VK_MVK_macos_surface)": [
         {
           "vuid": "VUID-VkMacOSSurfaceCreateInfoMVK-pView-04144",
-          "text": " If <code>pView</code> is a <a href=\"#CAMetalLayer\">CAMetalLayer</a> object, it <strong class=\"purple\">must</strong> be a valid <a href=\"#CAMetalLayer\">CAMetalLayer</a>"
+          "text": " If <code>pView</code> is a <code>CAMetalLayer</code> object, it <strong class=\"purple\">must</strong> be a valid <code>CAMetalLayer</code>"
         },
         {
           "vuid": "VUID-VkMacOSSurfaceCreateInfoMVK-pView-01317",
-          "text": " If <code>pView</code> is an <code>NSView</code> object, it <strong class=\"purple\">must</strong> be a valid <code>NSView</code>, <strong class=\"purple\">must</strong> be backed by a <code>CALayer</code> object of type <a href=\"#CAMetalLayer\">CAMetalLayer</a>, and <a href=\"#vkCreateMacOSSurfaceMVK\">vkCreateMacOSSurfaceMVK</a> <strong class=\"purple\">must</strong> be called on the main thread"
+          "text": " If <code>pView</code> is an <code>NSView</code> object, it <strong class=\"purple\">must</strong> be a valid <code>NSView</code>, <strong class=\"purple\">must</strong> be backed by a <code>CALayer</code> object of type <code>CAMetalLayer</code>, and <a href=\"#vkCreateMacOSSurfaceMVK\">vkCreateMacOSSurfaceMVK</a> <strong class=\"purple\">must</strong> be called on the main thread"
         },
         {
           "vuid": "VUID-VkMacOSSurfaceCreateInfoMVK-sType-sType",
@@ -54458,7 +54094,7 @@
         },
         {
           "vuid": "VUID-vkGetPhysicalDeviceSurfaceSupportKHR-pSupported-parameter",
-          "text": " <code>pSupported</code> <strong class=\"purple\">must</strong> be a valid pointer to a <a href=\"#VkBool32\">VkBool32</a> value"
+          "text": " <code>pSupported</code> <strong class=\"purple\">must</strong> be a valid pointer to a <code>VkBool32</code> value"
         },
         {
           "vuid": "VUID-vkGetPhysicalDeviceSurfaceSupportKHR-commonparent",
@@ -55005,8 +54641,8 @@
           "text": " <code>swapchain</code> <strong class=\"purple\">must</strong> be a valid <a href=\"#VkSwapchainKHR\">VkSwapchainKHR</a> handle"
         },
         {
-          "vuid": "VUID-vkAcquireFullScreenExclusiveModeEXT-swapchain-parent",
-          "text": " <code>swapchain</code> <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from <code>device</code>"
+          "vuid": "VUID-vkAcquireFullScreenExclusiveModeEXT-commonparent",
+          "text": " Both of <code>device</code>, and <code>swapchain</code> <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from the same <a href=\"#VkInstance\">VkInstance</a>"
         }
       ]
     },
@@ -55137,8 +54773,8 @@
           "text": " <code>pDisplayTimingProperties</code> <strong class=\"purple\">must</strong> be a valid pointer to a <a href=\"#VkRefreshCycleDurationGOOGLE\">VkRefreshCycleDurationGOOGLE</a> structure"
         },
         {
-          "vuid": "VUID-vkGetRefreshCycleDurationGOOGLE-swapchain-parent",
-          "text": " <code>swapchain</code> <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from <code>device</code>"
+          "vuid": "VUID-vkGetRefreshCycleDurationGOOGLE-commonparent",
+          "text": " Both of <code>device</code>, and <code>swapchain</code> <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from the same <a href=\"#VkInstance\">VkInstance</a>"
         }
       ]
     },
@@ -55161,8 +54797,8 @@
           "text": " If the value referenced by <code>pPresentationTimingCount</code> is not <code>0</code>, and <code>pPresentationTimings</code> is not <code>NULL</code>, <code>pPresentationTimings</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>pPresentationTimingCount</code> <a href=\"#VkPastPresentationTimingGOOGLE\">VkPastPresentationTimingGOOGLE</a> structures"
         },
         {
-          "vuid": "VUID-vkGetPastPresentationTimingGOOGLE-swapchain-parent",
-          "text": " <code>swapchain</code> <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from <code>device</code>"
+          "vuid": "VUID-vkGetPastPresentationTimingGOOGLE-commonparent",
+          "text": " Both of <code>device</code>, and <code>swapchain</code> <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from the same <a href=\"#VkInstance\">VkInstance</a>"
         }
       ]
     },
@@ -55177,8 +54813,8 @@
           "text": " <code>swapchain</code> <strong class=\"purple\">must</strong> be a valid <a href=\"#VkSwapchainKHR\">VkSwapchainKHR</a> handle"
         },
         {
-          "vuid": "VUID-vkGetSwapchainStatusKHR-swapchain-parent",
-          "text": " <code>swapchain</code> <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from <code>device</code>"
+          "vuid": "VUID-vkGetSwapchainStatusKHR-commonparent",
+          "text": " Both of <code>device</code>, and <code>swapchain</code> <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from the same <a href=\"#VkInstance\">VkInstance</a>"
         }
       ]
     },
@@ -55317,6 +54953,10 @@
           "text": " If <code>oldSwapchain</code> is not <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>, <code>oldSwapchain</code> <strong class=\"purple\">must</strong> be a valid <a href=\"#VkSwapchainKHR\">VkSwapchainKHR</a> handle"
         },
         {
+          "vuid": "VUID-VkSwapchainCreateInfoKHR-oldSwapchain-parent",
+          "text": " If <code>oldSwapchain</code> is a valid handle, it <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from <code>surface</code>"
+        },
+        {
           "vuid": "VUID-VkSwapchainCreateInfoKHR-commonparent",
           "text": " Both of <code>oldSwapchain</code>, and <code>surface</code> that are valid handles of non-ignored parameters <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from the same <a href=\"#VkInstance\">VkInstance</a>"
         }
@@ -55437,8 +55077,8 @@
           "text": " <code>swapChain</code> <strong class=\"purple\">must</strong> be a valid <a href=\"#VkSwapchainKHR\">VkSwapchainKHR</a> handle"
         },
         {
-          "vuid": "VUID-vkSetLocalDimmingAMD-swapChain-parent",
-          "text": " <code>swapChain</code> <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from <code>device</code>"
+          "vuid": "VUID-vkSetLocalDimmingAMD-commonparent",
+          "text": " Both of <code>device</code>, and <code>swapChain</code> <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from the same <a href=\"#VkInstance\">VkInstance</a>"
         },
         {
           "vuid": "VUID-vkSetLocalDimmingAMD-localDimmingSupport-04618",
@@ -55485,8 +55125,8 @@
           "text": " <code>pCounterValue</code> <strong class=\"purple\">must</strong> be a valid pointer to a <code>uint64_t</code> value"
         },
         {
-          "vuid": "VUID-vkGetSwapchainCounterEXT-swapchain-parent",
-          "text": " <code>swapchain</code> <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from <code>device</code>"
+          "vuid": "VUID-vkGetSwapchainCounterEXT-commonparent",
+          "text": " Both of <code>device</code>, and <code>swapchain</code> <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from the same <a href=\"#VkInstance\">VkInstance</a>"
         }
       ]
     },
@@ -55517,8 +55157,8 @@
           "text": " If <code>pAllocator</code> is not <code>NULL</code>, <code>pAllocator</code> <strong class=\"purple\">must</strong> be a valid pointer to a valid <a href=\"#VkAllocationCallbacks\">VkAllocationCallbacks</a> structure"
         },
         {
-          "vuid": "VUID-vkDestroySwapchainKHR-swapchain-parent",
-          "text": " If <code>swapchain</code> is a valid handle, it <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from <code>device</code>"
+          "vuid": "VUID-vkDestroySwapchainKHR-commonparent",
+          "text": " Both of <code>device</code>, and <code>swapchain</code> that are valid handles of non-ignored parameters <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from the same <a href=\"#VkInstance\">VkInstance</a>"
         }
       ]
     },
@@ -55565,8 +55205,8 @@
           "text": " If the value referenced by <code>pSwapchainImageCount</code> is not <code>0</code>, and <code>pSwapchainImages</code> is not <code>NULL</code>, <code>pSwapchainImages</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>pSwapchainImageCount</code> <a href=\"#VkImage\">VkImage</a> handles"
         },
         {
-          "vuid": "VUID-vkGetSwapchainImagesKHR-swapchain-parent",
-          "text": " <code>swapchain</code> <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from <code>device</code>"
+          "vuid": "VUID-vkGetSwapchainImagesKHR-commonparent",
+          "text": " Both of <code>device</code>, and <code>swapchain</code> <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from the same <a href=\"#VkInstance\">VkInstance</a>"
         }
       ]
     },
@@ -55617,16 +55257,16 @@
           "text": " <code>pImageIndex</code> <strong class=\"purple\">must</strong> be a valid pointer to a <code>uint32_t</code> value"
         },
         {
-          "vuid": "VUID-vkAcquireNextImageKHR-swapchain-parent",
-          "text": " <code>swapchain</code> <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from <code>device</code>"
-        },
-        {
           "vuid": "VUID-vkAcquireNextImageKHR-semaphore-parent",
           "text": " If <code>semaphore</code> is a valid handle, it <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from <code>device</code>"
         },
         {
           "vuid": "VUID-vkAcquireNextImageKHR-fence-parent",
           "text": " If <code>fence</code> is a valid handle, it <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from <code>device</code>"
+        },
+        {
+          "vuid": "VUID-vkAcquireNextImageKHR-commonparent",
+          "text": " Both of <code>device</code>, and <code>swapchain</code> that are valid handles of non-ignored parameters <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from the same <a href=\"#VkInstance\">VkInstance</a>"
         }
       ],
       "(VK_KHR_surface)+(VK_KHR_swapchain)+(VK_VERSION_1_2,VK_KHR_timeline_semaphore)": [
@@ -55708,7 +55348,7 @@
         },
         {
           "vuid": "VUID-VkAcquireNextImageInfoKHR-commonparent",
-          "text": " Each of <code>fence</code>, <code>semaphore</code>, and <code>swapchain</code> that are valid handles of non-ignored parameters <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from the same <a href=\"#VkDevice\">VkDevice</a>"
+          "text": " Each of <code>fence</code>, <code>semaphore</code>, and <code>swapchain</code> that are valid handles of non-ignored parameters <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from the same <a href=\"#VkInstance\">VkInstance</a>"
         }
       ],
       "(VK_KHR_surface)+(VK_KHR_swapchain)+(VK_VERSION_1_1,VK_KHR_device_group)+(VK_VERSION_1_2,VK_KHR_timeline_semaphore)": [
@@ -55812,7 +55452,7 @@
         },
         {
           "vuid": "VUID-VkPresentInfoKHR-commonparent",
-          "text": " Both of the elements of <code>pSwapchains</code>, and the elements of <code>pWaitSemaphores</code> that are valid handles of non-ignored parameters <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from the same <a href=\"#VkDevice\">VkDevice</a>"
+          "text": " Both of the elements of <code>pSwapchains</code>, and the elements of <code>pWaitSemaphores</code> that are valid handles of non-ignored parameters <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from the same <a href=\"#VkInstance\">VkInstance</a>"
         }
       ]
     },
@@ -55983,8 +55623,8 @@
           "text": " <code>swapchain</code> <strong class=\"purple\">must</strong> be a valid <a href=\"#VkSwapchainKHR\">VkSwapchainKHR</a> handle"
         },
         {
-          "vuid": "VUID-vkWaitForPresentKHR-swapchain-parent",
-          "text": " <code>swapchain</code> <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from <code>device</code>"
+          "vuid": "VUID-vkWaitForPresentKHR-commonparent",
+          "text": " Both of <code>device</code>, and <code>swapchain</code> <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from the same <a href=\"#VkInstance\">VkInstance</a>"
         }
       ]
     },
@@ -56019,8 +55659,8 @@
           "text": " <code>swapchainCount</code> <strong class=\"purple\">must</strong> be greater than <code>0</code>"
         },
         {
-          "vuid": "VUID-vkSetHdrMetadataEXT-pSwapchains-parent",
-          "text": " Each element of <code>pSwapchains</code> <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from <code>device</code>"
+          "vuid": "VUID-vkSetHdrMetadataEXT-commonparent",
+          "text": " Both of <code>device</code>, and the elements of <code>pSwapchains</code> <strong class=\"purple\">must</strong> have been created, allocated, or retrieved from the same <a href=\"#VkInstance\">VkInstance</a>"
         }
       ]
     },
@@ -56944,7 +56584,7 @@
         },
         {
           "vuid": "VUID-vkCmdBuildAccelerationStructuresIndirectKHR-pIndirectDeviceAddresses-parameter",
-          "text": " <code>pIndirectDeviceAddresses</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>infoCount</code> <a href=\"#VkDeviceAddress\">VkDeviceAddress</a> values"
+          "text": " <code>pIndirectDeviceAddresses</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>infoCount</code> <code>VkDeviceAddress</code> values"
         },
         {
           "vuid": "VUID-vkCmdBuildAccelerationStructuresIndirectKHR-pIndirectStrides-parameter",
@@ -57064,7 +56704,7 @@
       "(VK_NV_ray_tracing,VK_KHR_acceleration_structure)+(VK_KHR_acceleration_structure)+(VK_EXT_opacity_micromap)": [
         {
           "vuid": "VUID-VkAccelerationStructureBuildGeometryInfoKHR-flags-07334",
-          "text": " If <code>flags</code> has the <code>VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_UPDATE_EXT</code> bit set then it <strong class=\"purple\">must</strong> not have the <code>VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_DATA_UPDATE_EXT</code> bit set"
+          "text": " If <code>flags</code> has the <code>VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_UPDATE_EXT</code> bit set then it <strong class=\"purple\">must</strong> not have the <code>VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_DATA_UPDATE_EXT</code> bit set."
         }
       ]
     },
@@ -57152,7 +56792,7 @@
       "(VK_NV_ray_tracing,VK_KHR_acceleration_structure)+(VK_KHR_acceleration_structure)+(VK_EXT_opacity_micromap)": [
         {
           "vuid": "VUID-VkAccelerationStructureTrianglesOpacityMicromapEXT-pUsageCounts-07335",
-          "text": " Only one of <code>pUsageCounts</code> or <code>ppUsageCounts</code> <strong class=\"purple\">can</strong> be a valid pointer, the other <strong class=\"purple\">must</strong> be <code>NULL</code>"
+          "text": " Only one of <code>pUsageCounts</code> or <code>ppUsageCounts</code> <strong class=\"purple\">can</strong> be a valid pointer, the other <strong class=\"purple\">must</strong> be <code>NULL</code>."
         },
         {
           "vuid": "VUID-VkAccelerationStructureTrianglesOpacityMicromapEXT-sType-sType",
@@ -58194,19 +57834,19 @@
         },
         {
           "vuid": "VUID-vkWriteAccelerationStructuresPropertiesKHR-queryType-03448",
-          "text": " If <code>queryType</code> is <code>VK_QUERY_TYPE_ACCELERATION_STRUCTURE_COMPACTED_SIZE_KHR</code>, then <code>stride</code> <strong class=\"purple\">must</strong> be a multiple of the size of <a href=\"#VkDeviceSize\">VkDeviceSize</a>"
+          "text": " If <code>queryType</code> is <code>VK_QUERY_TYPE_ACCELERATION_STRUCTURE_COMPACTED_SIZE_KHR</code>, then <code>stride</code> <strong class=\"purple\">must</strong> be a multiple of the size of <code>VkDeviceSize</code>"
         },
         {
           "vuid": "VUID-vkWriteAccelerationStructuresPropertiesKHR-queryType-03449",
-          "text": " If <code>queryType</code> is <code>VK_QUERY_TYPE_ACCELERATION_STRUCTURE_COMPACTED_SIZE_KHR</code>, then <code>pData</code> <strong class=\"purple\">must</strong> point to a <a href=\"#VkDeviceSize\">VkDeviceSize</a>"
+          "text": " If <code>queryType</code> is <code>VK_QUERY_TYPE_ACCELERATION_STRUCTURE_COMPACTED_SIZE_KHR</code>, then <code>pData</code> <strong class=\"purple\">must</strong> point to a <code>VkDeviceSize</code>"
         },
         {
           "vuid": "VUID-vkWriteAccelerationStructuresPropertiesKHR-queryType-03450",
-          "text": " If <code>queryType</code> is <code>VK_QUERY_TYPE_ACCELERATION_STRUCTURE_SERIALIZATION_SIZE_KHR</code>, then <code>stride</code> <strong class=\"purple\">must</strong> be a multiple of the size of <a href=\"#VkDeviceSize\">VkDeviceSize</a>"
+          "text": " If <code>queryType</code> is <code>VK_QUERY_TYPE_ACCELERATION_STRUCTURE_SERIALIZATION_SIZE_KHR</code>, then <code>stride</code> <strong class=\"purple\">must</strong> be a multiple of the size of <code>VkDeviceSize</code>"
         },
         {
           "vuid": "VUID-vkWriteAccelerationStructuresPropertiesKHR-queryType-03451",
-          "text": " If <code>queryType</code> is <code>VK_QUERY_TYPE_ACCELERATION_STRUCTURE_SERIALIZATION_SIZE_KHR</code>, then <code>pData</code> <strong class=\"purple\">must</strong> point to a <a href=\"#VkDeviceSize\">VkDeviceSize</a>"
+          "text": " If <code>queryType</code> is <code>VK_QUERY_TYPE_ACCELERATION_STRUCTURE_SERIALIZATION_SIZE_KHR</code>, then <code>pData</code> <strong class=\"purple\">must</strong> point to a <code>VkDeviceSize</code>"
         },
         {
           "vuid": "VUID-vkWriteAccelerationStructuresPropertiesKHR-dataSize-03452",
@@ -58256,19 +57896,19 @@
         },
         {
           "vuid": "VUID-vkWriteAccelerationStructuresPropertiesKHR-queryType-06731",
-          "text": " If <code>queryType</code> is <code>VK_QUERY_TYPE_ACCELERATION_STRUCTURE_SIZE_KHR</code>, then <code>stride</code> <strong class=\"purple\">must</strong> be a multiple of the size of <a href=\"#VkDeviceSize\">VkDeviceSize</a>"
+          "text": " If <code>queryType</code> is <code>VK_QUERY_TYPE_ACCELERATION_STRUCTURE_SIZE_KHR</code>, then <code>stride</code> <strong class=\"purple\">must</strong> be a multiple of the size of <code>VkDeviceSize</code>"
         },
         {
           "vuid": "VUID-vkWriteAccelerationStructuresPropertiesKHR-queryType-06732",
-          "text": " If <code>queryType</code> is <code>VK_QUERY_TYPE_ACCELERATION_STRUCTURE_SIZE_KHR</code>, then <code>pData</code> <strong class=\"purple\">must</strong> point to a <a href=\"#VkDeviceSize\">VkDeviceSize</a>"
+          "text": " If <code>queryType</code> is <code>VK_QUERY_TYPE_ACCELERATION_STRUCTURE_SIZE_KHR</code>, then <code>pData</code> <strong class=\"purple\">must</strong> point to a <code>VkDeviceSize</code>"
         },
         {
           "vuid": "VUID-vkWriteAccelerationStructuresPropertiesKHR-queryType-06733",
-          "text": " If <code>queryType</code> is <code>VK_QUERY_TYPE_ACCELERATION_STRUCTURE_SERIALIZATION_BOTTOM_LEVEL_POINTERS_KHR</code>, then <code>stride</code> <strong class=\"purple\">must</strong> be a multiple of the size of <a href=\"#VkDeviceSize\">VkDeviceSize</a>"
+          "text": " If <code>queryType</code> is <code>VK_QUERY_TYPE_ACCELERATION_STRUCTURE_SERIALIZATION_BOTTOM_LEVEL_POINTERS_KHR</code>, then <code>stride</code> <strong class=\"purple\">must</strong> be a multiple of the size of <code>VkDeviceSize</code>"
         },
         {
           "vuid": "VUID-vkWriteAccelerationStructuresPropertiesKHR-queryType-06734",
-          "text": " If <code>queryType</code> is <code>VK_QUERY_TYPE_ACCELERATION_STRUCTURE_SERIALIZATION_BOTTOM_LEVEL_POINTERS_KHR</code>, then <code>pData</code> <strong class=\"purple\">must</strong> point to a <a href=\"#VkDeviceSize\">VkDeviceSize</a>"
+          "text": " If <code>queryType</code> is <code>VK_QUERY_TYPE_ACCELERATION_STRUCTURE_SERIALIZATION_BOTTOM_LEVEL_POINTERS_KHR</code>, then <code>pData</code> <strong class=\"purple\">must</strong> point to a <code>VkDeviceSize</code>"
         }
       ],
       "(VK_NV_ray_tracing,VK_KHR_acceleration_structure)+!(VK_KHR_ray_tracing_maintenance1)": [
@@ -58380,7 +58020,7 @@
       "(VK_EXT_opacity_micromap)": [
         {
           "vuid": "VUID-VkMicromapBuildInfoEXT-pUsageCounts-07516",
-          "text": " Only one of <code>pUsageCounts</code> or <code>ppUsageCounts</code> <strong class=\"purple\">can</strong> be a valid pointer, the other <strong class=\"purple\">must</strong> be <code>NULL</code>"
+          "text": " Only one of <code>pUsageCounts</code> or <code>ppUsageCounts</code> <strong class=\"purple\">can</strong> be a valid pointer, the other <strong class=\"purple\">must</strong> be <code>NULL</code>."
         },
         {
           "vuid": "VUID-VkMicromapBuildInfoEXT-type-07517",
@@ -58420,7 +58060,7 @@
       "(VK_EXT_opacity_micromap)": [
         {
           "vuid": "VUID-VkMicromapUsageEXT-format-07519",
-          "text": " If the <a href=\"#VkMicromapTypeEXT\">VkMicromapTypeEXT</a> of the micromap is <code>VK_MICROMAP_TYPE_OPACITY_MICROMAP_EXT</code> then <code>format</code> <strong class=\"purple\">must</strong> be <code>VK_OPACITY_MICROMAP_FORMAT_2_STATE_EXT</code> or <code>VK_OPACITY_MICROMAP_FORMAT_4_STATE_EXT</code>"
+          "text": " If the <a href=\"#VkMicromapTypeEXT\">VkMicromapTypeEXT</a> of the micromap is <code>VK_MICROMAP_TYPE_OPACITY_MICROMAP_EXT</code> then <code>format</code> <strong class=\"purple\">must</strong> be <code>VK_OPACITY_MICROMAP_FORMAT_2_STATE_EXT</code> or <code>VK_OPACITY_MICROMAP_FORMAT_4_STATE_EXT</code>."
         },
         {
           "vuid": "VUID-VkMicromapUsageEXT-format-07520",
@@ -58436,7 +58076,7 @@
       "(VK_EXT_opacity_micromap)": [
         {
           "vuid": "VUID-VkMicromapTriangleEXT-format-07522",
-          "text": " If the <a href=\"#VkMicromapTypeEXT\">VkMicromapTypeEXT</a> of the micromap is <code>VK_MICROMAP_TYPE_OPACITY_MICROMAP_EXT</code> then <code>format</code> <strong class=\"purple\">must</strong> be <code>VK_OPACITY_MICROMAP_FORMAT_2_STATE_EXT</code> or <code>VK_OPACITY_MICROMAP_FORMAT_4_STATE_EXT</code>"
+          "text": " If the <a href=\"#VkMicromapTypeEXT\">VkMicromapTypeEXT</a> of the micromap is <code>VK_MICROMAP_TYPE_OPACITY_MICROMAP_EXT</code> then <code>format</code> <strong class=\"purple\">must</strong> be <code>VK_OPACITY_MICROMAP_FORMAT_2_STATE_EXT</code> or <code>VK_OPACITY_MICROMAP_FORMAT_4_STATE_EXT</code>."
         },
         {
           "vuid": "VUID-VkMicromapTriangleEXT-format-07523",
@@ -59040,11 +58680,11 @@
         },
         {
           "vuid": "VUID-vkWriteMicromapsPropertiesEXT-queryType-07573",
-          "text": " If <code>queryType</code> is <code>VK_QUERY_TYPE_MICROMAP_SERIALIZATION_SIZE_EXT</code>, then <code>stride</code> <strong class=\"purple\">must</strong> be a multiple of the size of <a href=\"#VkDeviceSize\">VkDeviceSize</a>"
+          "text": " If <code>queryType</code> is <code>VK_QUERY_TYPE_MICROMAP_SERIALIZATION_SIZE_EXT</code>, then <code>stride</code> <strong class=\"purple\">must</strong> be a multiple of the size of <code>VkDeviceSize</code>"
         },
         {
           "vuid": "VUID-vkWriteMicromapsPropertiesEXT-queryType-07574",
-          "text": " If <code>queryType</code> is <code>VK_QUERY_TYPE_MICROMAP_SERIALIZATION_SIZE_EXT</code>, then <code>pData</code> <strong class=\"purple\">must</strong> point to a <a href=\"#VkDeviceSize\">VkDeviceSize</a>"
+          "text": " If <code>queryType</code> is <code>VK_QUERY_TYPE_MICROMAP_SERIALIZATION_SIZE_EXT</code>, then <code>pData</code> <strong class=\"purple\">must</strong> point to a <code>VkDeviceSize</code>"
         },
         {
           "vuid": "VUID-vkWriteMicromapsPropertiesEXT-queryType-07575",
@@ -59141,14 +58781,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdTraceRaysNV-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdTraceRaysNV-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdTraceRaysNV-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -59300,7 +58932,7 @@
       "(VK_NV_ray_tracing,VK_KHR_ray_tracing_pipeline)+(VK_NV_ray_tracing)+!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdTraceRaysNV-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_NV_ray_tracing,VK_KHR_ray_tracing_pipeline)+(VK_NV_ray_tracing)+(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -59390,7 +59022,7 @@
         },
         {
           "vuid": "VUID-vkCmdTraceRaysNV-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "(VK_NV_ray_tracing,VK_KHR_ray_tracing_pipeline)+(VK_NV_ray_tracing)+!(VK_EXT_pipeline_robustness)": [
@@ -59478,15 +59110,15 @@
         },
         {
           "vuid": "VUID-vkCmdTraceRaysNV-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdTraceRaysNV-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdTraceRaysNV-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ]
     },
@@ -59533,14 +59165,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdTraceRaysKHR-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdTraceRaysKHR-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdTraceRaysKHR-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -59728,7 +59352,7 @@
       "(VK_NV_ray_tracing,VK_KHR_ray_tracing_pipeline)+(VK_KHR_ray_tracing_pipeline)+!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdTraceRaysKHR-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_NV_ray_tracing,VK_KHR_ray_tracing_pipeline)+(VK_KHR_ray_tracing_pipeline)+(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -59818,7 +59442,7 @@
         },
         {
           "vuid": "VUID-vkCmdTraceRaysKHR-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "(VK_NV_ray_tracing,VK_KHR_ray_tracing_pipeline)+(VK_KHR_ray_tracing_pipeline)+!(VK_EXT_pipeline_robustness)": [
@@ -59906,15 +59530,15 @@
         },
         {
           "vuid": "VUID-vkCmdTraceRaysKHR-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdTraceRaysKHR-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdTraceRaysKHR-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ]
     },
@@ -60041,14 +59665,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdTraceRaysIndirectKHR-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdTraceRaysIndirectKHR-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdTraceRaysIndirectKHR-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -60240,7 +59856,7 @@
       "(VK_NV_ray_tracing,VK_KHR_ray_tracing_pipeline)+(VK_KHR_ray_tracing_pipeline)+!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdTraceRaysIndirectKHR-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_NV_ray_tracing,VK_KHR_ray_tracing_pipeline)+(VK_KHR_ray_tracing_pipeline)+(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -60330,7 +59946,7 @@
         },
         {
           "vuid": "VUID-vkCmdTraceRaysIndirectKHR-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "(VK_NV_ray_tracing,VK_KHR_ray_tracing_pipeline)+(VK_KHR_ray_tracing_pipeline)+!(VK_EXT_pipeline_robustness)": [
@@ -60418,15 +60034,15 @@
         },
         {
           "vuid": "VUID-vkCmdTraceRaysIndirectKHR-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdTraceRaysIndirectKHR-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdTraceRaysIndirectKHR-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ],
       "(VK_NV_ray_tracing,VK_KHR_ray_tracing_pipeline)+(VK_KHR_ray_tracing_pipeline)+(VK_NV_ray_tracing_motion_blur)": [
@@ -60499,14 +60115,6 @@
           "text": " If the <code>VkPipeline</code> object bound to the pipeline bind point used by this command accesses a <code>VkSampler</code> object that uses unnormalized coordinates, that sampler <strong class=\"purple\">must</strong> not be used with any of the SPIR-V <code>OpImageSample*</code> or <code>OpImageSparseSample*</code> instructions that includes a LOD bias or any offset values, in any shader stage"
         },
         {
-          "vuid": "VUID-vkCmdTraceRaysIndirect2KHR-viewType-07752",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>viewType</code> <strong class=\"purple\">must</strong> match the <code>Dim</code> operand of the <code>OpTypeImage</code> as described in <a href=\"#textures-operation-validation\">Instruction/Sampler/Image View Validation</a>"
-        },
-        {
-          "vuid": "VUID-vkCmdTraceRaysIndirect2KHR-format-07753",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed as a result of this command, then the image view&#8217;s <code>format</code> <strong class=\"purple\">must</strong> match the numeric format from the <code>Sampled</code> <code>Type</code> operand of the <code>OpTypeImage</code> as described in the SPIR-V Sampled Type column of the <a href=\"#formats-numericformat\">Interpretation of Numeric Format</a> table"
-        },
-        {
           "vuid": "VUID-vkCmdTraceRaysIndirect2KHR-None-04115",
           "text": " If a <a href=\"#VkImageView\">VkImageView</a> is accessed using <code>OpImageWrite</code> as a result of this command, then the <code>Type</code> of the <code>Texel</code> operand of that instruction <strong class=\"purple\">must</strong> have at least as many components as the image view&#8217;s format"
         },
@@ -60574,7 +60182,7 @@
       "(VK_NV_ray_tracing,VK_KHR_ray_tracing_pipeline)+(VK_KHR_ray_tracing_pipeline)+(VK_KHR_ray_tracing_maintenance1)+!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-vkCmdTraceRaysIndirect2KHR-aspectMask-06478",
-          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>"
+          "text": " If a <a href=\"#VkImageView\">VkImageView</a> is sampled with <a href=\"#textures-depth-compare-operation\">depth comparison</a>, the image view <strong class=\"purple\">must</strong> have been created with an <code>aspectMask</code> that contains <code>VK_IMAGE_ASPECT_DEPTH_BIT</code>."
         }
       ],
       "(VK_NV_ray_tracing,VK_KHR_ray_tracing_pipeline)+(VK_KHR_ray_tracing_pipeline)+(VK_KHR_ray_tracing_maintenance1)+(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
@@ -60664,7 +60272,7 @@
         },
         {
           "vuid": "VUID-vkCmdTraceRaysIndirect2KHR-None-08119",
-          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident"
+          "text": " If a descriptor is dynamically used with a <code>VkPipeline</code> created with <code>VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT</code>, the descriptor memory <strong class=\"purple\">must</strong> be resident."
         }
       ],
       "(VK_NV_ray_tracing,VK_KHR_ray_tracing_pipeline)+(VK_KHR_ray_tracing_pipeline)+(VK_KHR_ray_tracing_maintenance1)+!(VK_EXT_pipeline_robustness)": [
@@ -60752,15 +60360,15 @@
         },
         {
           "vuid": "VUID-vkCmdTraceRaysIndirect2KHR-OpImageBlockMatchSADQCOM-06976",
-          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>"
+          "text": " If <code>OpImageBlockMatchSADQCOM</code> or OpImageBlockMatchSSDQCOM is used to read from a reference image as result of this command, then the specified reference coordinates <strong class=\"purple\">must</strong> not fail <a href=\"#textures-integer-coordinate-validation\">integer texel coordinate validation</a>."
         },
         {
           "vuid": "VUID-vkCmdTraceRaysIndirect2KHR-OpImageWeightedSampleQCOM-06977",
-          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         },
         {
           "vuid": "VUID-vkCmdTraceRaysIndirect2KHR-OpImageWeightedSampleQCOM-06978",
-          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>"
+          "text": " If any command other than <code>OpImageWeightedSampleQCOM</code>, <code>OpImageBoxFilterQCOM</code>, <code>OpImageBlockMatchSSDQCOM</code>, or <code>OpImageBlockMatchSADQCOM</code> uses a <a href=\"#VkSampler\">VkSampler</a> as a result of this command, then the sampler <strong class=\"purple\">must</strong> not have been created with <code>VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM</code>."
         }
       ],
       "(VK_NV_ray_tracing,VK_KHR_ray_tracing_pipeline)+(VK_KHR_ray_tracing_pipeline)+(VK_KHR_ray_tracing_maintenance1)+(VK_NV_ray_tracing_motion_blur)": [
@@ -60898,7 +60506,7 @@
       "(VK_NV_memory_decompression)": [
         {
           "vuid": "VUID-vkCmdDecompressMemoryNV-None-07684",
-          "text": " The <a href=\"#features-memoryDecompression\"><code>memoryDecompression</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " The <a href=\"#features-memoryDecompression\">memoryDecompression</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-vkCmdDecompressMemoryNV-commandBuffer-parameter",
@@ -60974,7 +60582,7 @@
       "(VK_NV_memory_decompression)": [
         {
           "vuid": "VUID-vkCmdDecompressMemoryIndirectCountNV-None-07692",
-          "text": " The <a href=\"#features-memoryDecompression\"><code>memoryDecompression</code></a> feature <strong class=\"purple\">must</strong> be enabled"
+          "text": " The <a href=\"#features-memoryDecompression\">memoryDecompression</a> feature <strong class=\"purple\">must</strong> be enabled"
         },
         {
           "vuid": "VUID-vkCmdDecompressMemoryIndirectCountNV-indirectCommandsAddress-07693",
@@ -61880,11 +61488,11 @@
       "(VK_KHR_video_queue)+(VK_EXT_video_decode_h264)": [
         {
           "vuid": "VUID-VkVideoDecodeH264ProfileInfoEXT-pNext-06259",
-          "text": " If the <a href=\"#VkVideoDecodeH264ProfileInfoEXT\">VkVideoDecodeH264ProfileInfoEXT</a> structure is included in the <code>pNext</code> chain of the <a href=\"#VkVideoCapabilitiesKHR\">VkVideoCapabilitiesKHR</a> structure passed to <a href=\"#vkGetPhysicalDeviceVideoCapabilitiesKHR\">vkGetPhysicalDeviceVideoCapabilitiesKHR</a>, the value in <code>pictureLayout</code> is treated as a bitmask of requested picture layouts. It is always valid to use the value <code>VK_VIDEO_DECODE_H264_PICTURE_LAYOUT_PROGRESSIVE_EXT</code> as the implementation is guaranteed to support decoding of progressive content"
+          "text": " If the <a href=\"#VkVideoDecodeH264ProfileInfoEXT\">VkVideoDecodeH264ProfileInfoEXT</a> structure is included in the <code>pNext</code> chain of the <a href=\"#VkVideoCapabilitiesKHR\">VkVideoCapabilitiesKHR</a> structure passed to <a href=\"#vkGetPhysicalDeviceVideoCapabilitiesKHR\">vkGetPhysicalDeviceVideoCapabilitiesKHR</a>, the value in <code>pictureLayout</code> is treated as a bitmask of requested picture layouts. It is always valid to use the value <code>VK_VIDEO_DECODE_H264_PICTURE_LAYOUT_PROGRESSIVE_EXT</code> as the implementation is guaranteed to support decoding of progressive content."
         },
         {
           "vuid": "VUID-VkVideoDecodeH264ProfileInfoEXT-pNext-06260",
-          "text": " If the <a href=\"#VkVideoDecodeH264ProfileInfoEXT\">VkVideoDecodeH264ProfileInfoEXT</a> structure is included in the <code>pNext</code> chain of the <a href=\"#VkVideoSessionCreateInfoKHR\">VkVideoSessionCreateInfoKHR</a> structure passed to <a href=\"#vkCreateVideoSessionKHR\">vkCreateVideoSessionKHR</a>, the value in <code>pictureLayout</code> <strong class=\"purple\">must</strong> be exactly one of <code>VK_VIDEO_DECODE_H264_PICTURE_LAYOUT_PROGRESSIVE_EXT</code>, <code>VK_VIDEO_DECODE_H264_PICTURE_LAYOUT_INTERLACED_INTERLEAVED_LINES_BIT_EXT</code> or <code>VK_VIDEO_DECODE_H264_PICTURE_LAYOUT_INTERLACED_SEPARATE_PLANES_BIT_EXT</code>"
+          "text": " If the <a href=\"#VkVideoDecodeH264ProfileInfoEXT\">VkVideoDecodeH264ProfileInfoEXT</a> structure is included in the <code>pNext</code> chain of the <a href=\"#VkVideoSessionCreateInfoKHR\">VkVideoSessionCreateInfoKHR</a> structure passed to <a href=\"#vkCreateVideoSessionKHR\">vkCreateVideoSessionKHR</a>, the value in <code>pictureLayout</code> <strong class=\"purple\">must</strong> be exactly one of <code>VK_VIDEO_DECODE_H264_PICTURE_LAYOUT_PROGRESSIVE_EXT</code>, <code>VK_VIDEO_DECODE_H264_PICTURE_LAYOUT_INTERLACED_INTERLEAVED_LINES_BIT_EXT</code> or <code>VK_VIDEO_DECODE_H264_PICTURE_LAYOUT_INTERLACED_SEPARATE_PLANES_BIT_EXT</code>."
         },
         {
           "vuid": "VUID-VkVideoDecodeH264ProfileInfoEXT-sType-sType",
@@ -62083,12 +61691,12 @@
           "text": " <code>pStdPictureInfo</code> <strong class=\"purple\">must</strong> be a valid pointer to a <code>StdVideoDecodeH265PictureInfo</code> value"
         },
         {
-          "vuid": "VUID-VkVideoDecodeH265PictureInfoEXT-pSliceSegmentOffsets-parameter",
-          "text": " <code>pSliceSegmentOffsets</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>sliceSegmentCount</code> <code>uint32_t</code> values"
+          "vuid": "VUID-VkVideoDecodeH265PictureInfoEXT-pSliceOffsets-parameter",
+          "text": " <code>pSliceOffsets</code> <strong class=\"purple\">must</strong> be a valid pointer to an array of <code>sliceCount</code> <code>uint32_t</code> values"
         },
         {
-          "vuid": "VUID-VkVideoDecodeH265PictureInfoEXT-sliceSegmentCount-arraylength",
-          "text": " <code>sliceSegmentCount</code> <strong class=\"purple\">must</strong> be greater than <code>0</code>"
+          "vuid": "VUID-VkVideoDecodeH265PictureInfoEXT-sliceCount-arraylength",
+          "text": " <code>sliceCount</code> <strong class=\"purple\">must</strong> be greater than <code>0</code>"
         }
       ]
     },
@@ -62412,11 +62020,11 @@
       "(VK_KHR_video_queue)+(VK_EXT_video_encode_h264)": [
         {
           "vuid": "VUID-VkVideoEncodeH264RateControlLayerInfoEXT-rateControlMode-06474",
-          "text": " When <a href=\"#VkVideoEncodeRateControlInfoKHR\">VkVideoEncodeRateControlInfoKHR</a>::<code>rateControlMode</code> is <code>VK_VIDEO_ENCODE_RATE_CONTROL_MODE_NONE_BIT_KHR</code>, both <code>useMinQp</code> and <code>useMaxQp</code> must be set to <code>VK_TRUE</code>"
+          "text": " When <a href=\"#VkVideoEncodeRateControlInfoKHR\">VkVideoEncodeRateControlInfoKHR</a>::<code>rateControlMode</code> is <code>VK_VIDEO_ENCODE_RATE_CONTROL_MODE_NONE_BIT_KHR</code>, both <code>useMinQp</code> and <code>useMaxQp</code> must be set to <code>VK_TRUE</code>."
         },
         {
           "vuid": "VUID-VkVideoEncodeH264RateControlLayerInfoEXT-rateControlMode-06475",
-          "text": " When <a href=\"#VkVideoEncodeRateControlInfoKHR\">VkVideoEncodeRateControlInfoKHR</a>::<code>rateControlMode</code> is <code>VK_VIDEO_ENCODE_RATE_CONTROL_MODE_NONE_BIT_KHR</code>, the values provided in <code>minQP</code> must be identical to those provided in <code>maxQp</code>"
+          "text": " When <a href=\"#VkVideoEncodeRateControlInfoKHR\">VkVideoEncodeRateControlInfoKHR</a>::<code>rateControlMode</code> is <code>VK_VIDEO_ENCODE_RATE_CONTROL_MODE_NONE_BIT_KHR</code>, the values provided in <code>minQP</code> must be identical to those provided in <code>maxQp</code>."
         },
         {
           "vuid": "VUID-VkVideoEncodeH264RateControlLayerInfoEXT-sType-sType",
@@ -62644,11 +62252,11 @@
       "(VK_KHR_video_queue)+(VK_EXT_video_encode_h265)": [
         {
           "vuid": "VUID-VkVideoEncodeH265RateControlLayerInfoEXT-rateControlMode-06476",
-          "text": " When <a href=\"#VkVideoEncodeRateControlInfoKHR\">VkVideoEncodeRateControlInfoKHR</a>::<code>rateControlMode</code> is <code>VK_VIDEO_ENCODE_RATE_CONTROL_MODE_NONE_BIT_KHR</code>, both <code>useMinQp</code> and <code>useMaxQp</code> must be set to <code>VK_TRUE</code>"
+          "text": " When <a href=\"#VkVideoEncodeRateControlInfoKHR\">VkVideoEncodeRateControlInfoKHR</a>::<code>rateControlMode</code> is <code>VK_VIDEO_ENCODE_RATE_CONTROL_MODE_NONE_BIT_KHR</code>, both <code>useMinQp</code> and <code>useMaxQp</code> must be set to <code>VK_TRUE</code>."
         },
         {
           "vuid": "VUID-VkVideoEncodeH265RateControlLayerInfoEXT-rateControlMode-06477",
-          "text": " When <a href=\"#VkVideoEncodeRateControlInfoKHR\">VkVideoEncodeRateControlInfoKHR</a>::<code>rateControlMode</code> is <code>VK_VIDEO_ENCODE_RATE_CONTROL_MODE_NONE_BIT_KHR</code>, the values provided in <code>minQP</code> must be identical to those provided in <code>maxQp</code>"
+          "text": " When <a href=\"#VkVideoEncodeRateControlInfoKHR\">VkVideoEncodeRateControlInfoKHR</a>::<code>rateControlMode</code> is <code>VK_VIDEO_ENCODE_RATE_CONTROL_MODE_NONE_BIT_KHR</code>, the values provided in <code>minQP</code> must be identical to those provided in <code>maxQp</code>."
         },
         {
           "vuid": "VUID-VkVideoEncodeH265RateControlLayerInfoEXT-sType-sType",
@@ -62744,51 +62352,51 @@
       "(VK_NV_optical_flow)": [
         {
           "vuid": "VUID-VkOpticalFlowSessionCreateInfoNV-width-07581",
-          "text": " <code>width</code> <strong class=\"purple\">must</strong> be greater than or equal to <code>VkPhysicalDeviceOpticalFlowPropertiesNV</code>::<code>minWidth</code> and less than or equal to <code>VkPhysicalDeviceOpticalFlowPropertiesNV</code>::<code>maxWidth</code>"
+          "text": " <code>width</code> <strong class=\"purple\">must</strong> be greater than or equal to <code>VkPhysicalDeviceOpticalFlowPropertiesNV</code>::<code>minWidth</code> and less than or equal to <code>VkPhysicalDeviceOpticalFlowPropertiesNV</code>::<code>maxWidth</code>."
         },
         {
           "vuid": "VUID-VkOpticalFlowSessionCreateInfoNV-height-07582",
-          "text": " <code>height</code> <strong class=\"purple\">must</strong> be greater than or equal to <code>VkPhysicalDeviceOpticalFlowPropertiesNV</code>::<code>minHeight</code> and less than or equal to <code>VkPhysicalDeviceOpticalFlowPropertiesNV</code>::<code>maxHeight</code>"
+          "text": " <code>height</code> <strong class=\"purple\">must</strong> be greater than or equal to <code>VkPhysicalDeviceOpticalFlowPropertiesNV</code>::<code>minHeight</code> and less than or equal to <code>VkPhysicalDeviceOpticalFlowPropertiesNV</code>::<code>maxHeight</code>."
         },
         {
           "vuid": "VUID-VkOpticalFlowSessionCreateInfoNV-imageFormat-07583",
-          "text": " <code>imageFormat</code> <strong class=\"purple\">must</strong> be one of the formats returned by <a href=\"#vkGetPhysicalDeviceOpticalFlowImageFormatsNV\">vkGetPhysicalDeviceOpticalFlowImageFormatsNV</a> for <code>VK_OPTICAL_FLOW_USAGE_INPUT_BIT_NV</code>"
+          "text": " <code>imageFormat</code> <strong class=\"purple\">must</strong> be one of the formats returned by <a href=\"#vkGetPhysicalDeviceOpticalFlowImageFormatsNV\">vkGetPhysicalDeviceOpticalFlowImageFormatsNV</a> for <code>VK_OPTICAL_FLOW_USAGE_INPUT_BIT_NV</code>."
         },
         {
           "vuid": "VUID-VkOpticalFlowSessionCreateInfoNV-flowVectorFormat-07584",
-          "text": " <code>flowVectorFormat</code> <strong class=\"purple\">must</strong> be one of the formats returned by <a href=\"#vkGetPhysicalDeviceOpticalFlowImageFormatsNV\">vkGetPhysicalDeviceOpticalFlowImageFormatsNV</a> for <code>VK_OPTICAL_FLOW_USAGE_OUTPUT_BIT_NV</code>"
+          "text": " <code>flowVectorFormat</code> <strong class=\"purple\">must</strong> be one of the formats returned by <a href=\"#vkGetPhysicalDeviceOpticalFlowImageFormatsNV\">vkGetPhysicalDeviceOpticalFlowImageFormatsNV</a> for <code>VK_OPTICAL_FLOW_USAGE_OUTPUT_BIT_NV</code>."
         },
         {
           "vuid": "VUID-VkOpticalFlowSessionCreateInfoNV-costFormat-07585",
-          "text": " <code>costFormat</code> <strong class=\"purple\">must</strong> be one of the formats returned by <a href=\"#vkGetPhysicalDeviceOpticalFlowImageFormatsNV\">vkGetPhysicalDeviceOpticalFlowImageFormatsNV</a> for <code>VK_OPTICAL_FLOW_USAGE_COST_BIT_NV</code> if <code>VK_OPTICAL_FLOW_SESSION_CREATE_ENABLE_COST_BIT_NV</code> is set in <code>flags</code>"
+          "text": " <code>costFormat</code> <strong class=\"purple\">must</strong> be one of the formats returned by <a href=\"#vkGetPhysicalDeviceOpticalFlowImageFormatsNV\">vkGetPhysicalDeviceOpticalFlowImageFormatsNV</a> for <code>VK_OPTICAL_FLOW_USAGE_COST_BIT_NV</code> if <code>VK_OPTICAL_FLOW_SESSION_CREATE_ENABLE_COST_BIT_NV</code> is set in <code>flags</code>."
         },
         {
           "vuid": "VUID-VkOpticalFlowSessionCreateInfoNV-outputGridSize-07586",
-          "text": " <code>outputGridSize</code> <strong class=\"purple\">must</strong> be exactly one of the bits reported in <code>VkPhysicalDeviceOpticalFlowPropertiesNV</code>::<code>supportedOutputGridSizes</code>"
+          "text": " <code>outputGridSize</code> <strong class=\"purple\">must</strong> be exactly one of the bits reported in <code>VkPhysicalDeviceOpticalFlowPropertiesNV</code>::<code>supportedOutputGridSizes</code>."
         },
         {
           "vuid": "VUID-VkOpticalFlowSessionCreateInfoNV-hintGridSize-07587",
-          "text": " <code>hintGridSize</code> <strong class=\"purple\">must</strong> be exactly one of the bits reported in <code>VkPhysicalDeviceOpticalFlowPropertiesNV</code>::<code>supportedHintGridSizes</code> if <code>VK_OPTICAL_FLOW_SESSION_CREATE_ENABLE_HINT_BIT_NV</code> is set in <code>flags</code>"
+          "text": " <code>hintGridSize</code> <strong class=\"purple\">must</strong> be exactly one of the bits reported in <code>VkPhysicalDeviceOpticalFlowPropertiesNV</code>::<code>supportedHintGridSizes</code> if <code>VK_OPTICAL_FLOW_SESSION_CREATE_ENABLE_HINT_BIT_NV</code> is set in <code>flags</code>."
         },
         {
           "vuid": "VUID-VkOpticalFlowSessionCreateInfoNV-flags-07588",
-          "text": " <code>VK_OPTICAL_FLOW_SESSION_CREATE_ENABLE_HINT_BIT_NV</code> <strong class=\"purple\">must</strong> not be set in <code>flags</code> if <code>VkPhysicalDeviceOpticalFlowPropertiesNV</code>::<code>hintSupported</code> is <code>VK_FALSE</code>"
+          "text": " <code>VK_OPTICAL_FLOW_SESSION_CREATE_ENABLE_HINT_BIT_NV</code> <strong class=\"purple\">must</strong> not be set in <code>flags</code> if <code>VkPhysicalDeviceOpticalFlowPropertiesNV</code>::<code>hintSupported</code> is <code>VK_FALSE</code>."
         },
         {
           "vuid": "VUID-VkOpticalFlowSessionCreateInfoNV-flags-07589",
-          "text": " <code>VK_OPTICAL_FLOW_SESSION_CREATE_ENABLE_COST_BIT_NV</code> <strong class=\"purple\">must</strong> not be set in <code>flags</code> if <code>VkPhysicalDeviceOpticalFlowPropertiesNV</code>::<code>costSupported</code> is <code>VK_FALSE</code>"
+          "text": " <code>VK_OPTICAL_FLOW_SESSION_CREATE_ENABLE_COST_BIT_NV</code> <strong class=\"purple\">must</strong> not be set in <code>flags</code> if <code>VkPhysicalDeviceOpticalFlowPropertiesNV</code>::<code>costSupported</code> is <code>VK_FALSE</code>."
         },
         {
           "vuid": "VUID-VkOpticalFlowSessionCreateInfoNV-flags-07590",
-          "text": " <code>VK_OPTICAL_FLOW_SESSION_CREATE_ENABLE_GLOBAL_FLOW_BIT_NV</code> <strong class=\"purple\">must</strong> not be set in <code>flags</code> if <code>VkPhysicalDeviceOpticalFlowPropertiesNV</code>::<code>globalFlowSupported</code> is <code>VK_FALSE</code>"
+          "text": " <code>VK_OPTICAL_FLOW_SESSION_CREATE_ENABLE_GLOBAL_FLOW_BIT_NV</code> <strong class=\"purple\">must</strong> not be set in <code>flags</code> if <code>VkPhysicalDeviceOpticalFlowPropertiesNV</code>::<code>globalFlowSupported</code> is <code>VK_FALSE</code>."
         },
         {
           "vuid": "VUID-VkOpticalFlowSessionCreateInfoNV-flags-07591",
-          "text": " <code>VK_OPTICAL_FLOW_SESSION_CREATE_ALLOW_REGIONS_BIT_NV</code> <strong class=\"purple\">must</strong> not be set in <code>flags</code> if <code>VkPhysicalDeviceOpticalFlowPropertiesNV</code>::<code>maxNumRegionsOfInterest</code> is 0"
+          "text": " <code>VK_OPTICAL_FLOW_SESSION_CREATE_ALLOW_REGIONS_BIT_NV</code> <strong class=\"purple\">must</strong> not be set in <code>flags</code> if <code>VkPhysicalDeviceOpticalFlowPropertiesNV</code>::<code>maxNumRegionsOfInterest</code> is 0."
         },
         {
           "vuid": "VUID-VkOpticalFlowSessionCreateInfoNV-flags-07592",
-          "text": " <code>VK_OPTICAL_FLOW_SESSION_CREATE_BOTH_DIRECTIONS_BIT_NV</code> <strong class=\"purple\">must</strong> not be set in <code>flags</code> if <code>VkPhysicalDeviceOpticalFlowPropertiesNV</code>::<code>bidirectionalFlowSupported</code> is <code>VK_FALSE</code>"
+          "text": " <code>VK_OPTICAL_FLOW_SESSION_CREATE_BOTH_DIRECTIONS_BIT_NV</code> <strong class=\"purple\">must</strong> not be set in <code>flags</code> if <code>VkPhysicalDeviceOpticalFlowPropertiesNV</code>::<code>bidirectionalFlowSupported</code> is <code>VK_FALSE</code>."
         },
         {
           "vuid": "VUID-VkOpticalFlowSessionCreateInfoNV-sType-sType",
@@ -62940,7 +62548,7 @@
       "(VK_NV_optical_flow)": [
         {
           "vuid": "VUID-VkOpticalFlowExecuteInfoNV-regionCount-07593",
-          "text": " <code>regionCount</code> <strong class=\"purple\">must</strong> be 0 if <code>VK_OPTICAL_FLOW_SESSION_CREATE_ALLOW_REGIONS_BIT_NV</code> was not set for <code>VkOpticalFlowSessionNV</code> on which this command is operating"
+          "text": " <code>regionCount</code> <strong class=\"purple\">must</strong> be 0 if <code>VK_OPTICAL_FLOW_SESSION_CREATE_ALLOW_REGIONS_BIT_NV</code> was not set for <code>VkOpticalFlowSessionNV</code> on which this command is operating."
         },
         {
           "vuid": "VUID-VkOpticalFlowExecuteInfoNV-sType-sType",
@@ -64208,14 +63816,6 @@
         }
       ]
     },
-    "VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM": {
-      "(VK_QCOM_multiview_per_view_viewports)": [
-        {
-          "vuid": "VUID-VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM-sType-sType",
-          "text": " <code>sType</code> <strong class=\"purple\">must</strong> be <code>VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_VIEWPORTS_FEATURES_QCOM</code>"
-        }
-      ]
-    },
     "VkPhysicalDevicePushDescriptorPropertiesKHR": {
       "(VK_KHR_push_descriptor)": [
         {
@@ -66390,7 +65990,7 @@
         },
         {
           "vuid": "VUID-StandaloneSpirv-OpTypeRuntimeArray-04680",
-          "text": " <code>OpTypeRuntimeArray</code> <strong class=\"purple\">must</strong> only be used for the last member of a <code>Block</code>-decorated <code>OpTypeStruct</code> in <code>StorageBuffer</code> or <code>PhysicalStorageBuffer</code> storage classes; <code>BufferBlock</code>-decorated <code>OpTypeStruct</code> in <code>Uniform</code> storage class; the outermost dimension of an arrayed variable in the <code>StorageBuffer</code>, <code>Uniform</code>, or <code>UniformConstant</code> storage classes"
+          "text": " <code>OpTypeRuntimeArray</code> <strong class=\"purple\">must</strong> only be used for the last member of a <code>Block</code>-decorated <code>OpTypeStruct</code> in <code>StorageBuffer</code> or <code>PhysicalStorageBuffer</code> storage classes; <code>BufferBlock</code>-decorated <code>OpTypeStruct</code> in <code>Uniform</code> storage class; the outermost dimension of an arrayed variable in the <code>StorageBuffer</code>, <code>Uniform</code>, or <code>UniformConstant</code> storage classes."
         },
         {
           "vuid": "VUID-StandaloneSpirv-Function-04681",
@@ -66610,7 +66210,7 @@
         },
         {
           "vuid": "VUID-StandaloneSpirv-MeshEXT-07728",
-          "text": " In mesh shaders using the <code>MeshEXT</code> or <code>MeshNV</code> {ExecutionModel} and the <code>OutputPoints</code> {ExecutionMode}, if the number of output points is greater than 0, a <code>PointSize</code> decorated variable <strong class=\"purple\">must</strong> be written to for each output point"
+          "text": " In mesh shaders using the <code>MeshEXT</code> or <code>MeshNV</code> {ExecutionModel} and the <code>OutputPoints</code> {ExecutionMode}, a <code>PointSize</code> decorated variable <strong class=\"purple\">must</strong> be written to"
         },
         {
           "vuid": "VUID-StandaloneSpirv-Input-07290",
@@ -66634,31 +66234,31 @@
       "(VK_VERSION_1_2,VK_KHR_vulkan_memory_model)": [
         {
           "vuid": "VUID-RuntimeSpirv-vulkanMemoryModel-06265",
-          "text": " If <a href=\"#features-vulkanMemoryModel\"><code>vulkanMemoryModel</code></a> is enabled and <a href=\"#features-vulkanMemoryModelDeviceScope\"><code>vulkanMemoryModelDeviceScope</code></a> is not enabled, <strong>Device</strong> memory scope <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#features-vulkanMemoryModel\"><code>vulkanMemoryModel</code></a> is enabled and <a href=\"#features-vulkanMemoryModelDeviceScope\"><code>vulkanMemoryModelDeviceScope</code></a> is not enabled, <strong>Device</strong> memory scope <strong class=\"purple\">must</strong> not be used."
         },
         {
           "vuid": "VUID-RuntimeSpirv-vulkanMemoryModel-06266",
-          "text": " If <a href=\"#features-vulkanMemoryModel\"><code>vulkanMemoryModel</code></a> is not enabled, <strong>QueueFamily</strong> memory scope <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#features-vulkanMemoryModel\"><code>vulkanMemoryModel</code></a> is not enabled, <strong>QueueFamily</strong> memory scope <strong class=\"purple\">must</strong> not be used."
         }
       ],
       "(VK_KHR_shader_clock)": [
         {
           "vuid": "VUID-RuntimeSpirv-shaderSubgroupClock-06267",
-          "text": " If <a href=\"#features-shaderSubgroupClock\"><code>shaderSubgroupClock</code></a> is not enabled, the <code>Subgroup</code> scope <strong class=\"purple\">must</strong> not be used for <code>OpReadClockKHR</code>"
+          "text": " If <a href=\"#features-shaderSubgroupClock\"><code>shaderSubgroupClock</code></a> is not enabled, the <code>Subgroup</code> scope <strong class=\"purple\">must</strong> not be used for <code>OpReadClockKHR</code>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-shaderDeviceClock-06268",
-          "text": " If <a href=\"#features-shaderDeviceClock\"><code>shaderDeviceClock</code></a> is not enabled, the <code>Device</code> scope <strong class=\"purple\">must</strong> not be used for <code>OpReadClockKHR</code>"
+          "text": " If <a href=\"#features-shaderDeviceClock\"><code>shaderDeviceClock</code></a> is not enabled, the <code>Device</code> scope <strong class=\"purple\">must</strong> not be used for <code>OpReadClockKHR</code>."
         }
       ],
       "!(VK_VERSION_1_3,VK_KHR_format_feature_flags2)": [
         {
           "vuid": "VUID-RuntimeSpirv-OpTypeImage-06269",
-          "text": " If <a href=\"#features-shaderStorageImageWriteWithoutFormat\"><code>shaderStorageImageWriteWithoutFormat</code></a> is not enabled, any variable created with a &#8220;Type&#8221; of <code>OpTypeImage</code> that has a &#8220;Sampled&#8221; operand of 2 and an &#8220;Image Format&#8221; operand of <code>Unknown</code> <strong class=\"purple\">must</strong> be decorated with <code>NonWritable</code>"
+          "text": " If <a href=\"#features-shaderStorageImageWriteWithoutFormat\"><code>shaderStorageImageWriteWithoutFormat</code></a> is not enabled, any variable created with a &#8220;Type&#8221; of <code>OpTypeImage</code> that has a &#8220;Sampled&#8221; operand of 2 and an &#8220;Image Format&#8221; operand of <code>Unknown</code> <strong class=\"purple\">must</strong> be decorated with <code>NonWritable</code>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpTypeImage-06270",
-          "text": " If <a href=\"#features-shaderStorageImageReadWithoutFormat\"><code>shaderStorageImageReadWithoutFormat</code></a> is not enabled, any variable created with a &#8220;Type&#8221; of <code>OpTypeImage</code> that has a &#8220;Sampled&#8221; operand of 2 and an &#8220;Image Format&#8221; operand of <code>Unknown</code> <strong class=\"purple\">must</strong> be decorated with <code>NonReadable</code>"
+          "text": " If <a href=\"#features-shaderStorageImageReadWithoutFormat\"><code>shaderStorageImageReadWithoutFormat</code></a> is not enabled, any variable created with a &#8220;Type&#8221; of <code>OpTypeImage</code> that has a &#8220;Sampled&#8221; operand of 2 and an &#8220;Image Format&#8221; operand of <code>Unknown</code> <strong class=\"purple\">must</strong> be decorated with <code>NonReadable</code>."
         }
       ],
       "core": [
@@ -66684,15 +66284,15 @@
         },
         {
           "vuid": "VUID-RuntimeSpirv-NonWritable-06340",
-          "text": " If <a href=\"#features-fragmentStoresAndAtomics\"><code>fragmentStoresAndAtomics</code></a> is not enabled, then all storage image, storage texel buffer, and storage buffer variables in the fragment stage <strong class=\"purple\">must</strong> be decorated with the <code>NonWritable</code> decoration"
+          "text": " If <a href=\"#features-fragmentStoresAndAtomics\"><code>fragmentStoresAndAtomics</code></a> is not enabled, then all storage image, storage texel buffer, and storage buffer variables in the fragment stage <strong class=\"purple\">must</strong> be decorated with the <code>NonWritable</code> decoration."
         },
         {
           "vuid": "VUID-RuntimeSpirv-NonWritable-06341",
-          "text": " If <a href=\"#features-vertexPipelineStoresAndAtomics\"><code>vertexPipelineStoresAndAtomics</code></a> is not enabled, then all storage image, storage texel buffer, and storage buffer variables in the vertex, tessellation, and geometry stages <strong class=\"purple\">must</strong> be decorated with the <code>NonWritable</code> decoration"
+          "text": " If <a href=\"#features-vertexPipelineStoresAndAtomics\"><code>vertexPipelineStoresAndAtomics</code></a> is not enabled, then all storage image, storage texel buffer, and storage buffer variables in the vertex, tessellation, and geometry stages <strong class=\"purple\">must</strong> be decorated with the <code>NonWritable</code> decoration."
         },
         {
           "vuid": "VUID-RuntimeSpirv-None-06342",
-          "text": " If <a href=\"#limits-subgroupQuadOperationsInAllStages\"><code>subgroupQuadOperationsInAllStages</code></a> is <code>VK_FALSE</code>, then <a href=\"#features-subgroup-quad\">quad subgroup operations</a> <strong class=\"purple\">must</strong> not be used except for in fragment and compute stages"
+          "text": " If <a href=\"#limits-subgroupQuadOperationsInAllStages\"><code>subgroupQuadOperationsInAllStages</code></a> is <code>VK_FALSE</code>, then <a href=\"#features-subgroup-quad\">quad subgroup operations</a> <strong class=\"purple\">must</strong> not be used except for in fragment and compute stages."
         },
         {
           "vuid": "VUID-RuntimeSpirv-Offset-06344",
@@ -66727,34 +66327,30 @@
           "text": " The product of <code>x</code> size, <code>y</code> size, and <code>z</code> size in <code>LocalSize</code> or <code>LocalSizeId</code> <strong class=\"purple\">must</strong> be less than or equal to <code>VkPhysicalDeviceLimits</code>::<code>maxComputeWorkGroupInvocations</code>"
         },
         {
-          "vuid": "VUID-RuntimeSpirv-OpEntryPoint-07754",
-          "text": " Any <a href=\"#interfaces-iointerfaces-user\">user-defined variables</a> between the <code>OpEntryPoint</code> of two shader stages <strong class=\"purple\">must</strong> have the same type and width for each component"
-        },
-        {
           "vuid": "VUID-RuntimeSpirv-Workgroup-06530",
           "text": " The sum of size in bytes for variables and <a href=\"#limits-maxComputeSharedMemorySize\">padding</a> in the <code>Workgroup</code> storage class in the <code>GLCompute</code> {ExecutionModel} <strong class=\"purple\">must</strong> be less than or equal to <a href=\"#limits-maxComputeSharedMemorySize\"><code>maxComputeSharedMemorySize</code></a>"
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpImage-06376",
-          "text": " If an <code>OpImage*Gather</code> operation has an image operand of <code>Offset</code>, <code>ConstOffset</code>, or <code>ConstOffsets</code> the offset value <strong class=\"purple\">must</strong> be greater than or equal to <a href=\"#limits-minTexelGatherOffset\"><code>minTexelGatherOffset</code></a>"
+          "text": " If an <code>OpImage*Gather</code> operation has an image operand of <code>Offset</code>, <code>ConstOffset</code>, or <code>ConstOffsets</code> the offset value <strong class=\"purple\">must</strong> be greater than or equal to <a href=\"#limits-minTexelGatherOffset\">minTexelGatherOffset</a>"
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpImage-06377",
-          "text": " If an <code>OpImage*Gather</code> operation has an image operand of <code>Offset</code>, <code>ConstOffset</code>, or <code>ConstOffsets</code> the offset value <strong class=\"purple\">must</strong> be less than or equal to <a href=\"#limits-maxTexelGatherOffset\"><code>maxTexelGatherOffset</code></a>"
+          "text": " If an <code>OpImage*Gather</code> operation has an image operand of <code>Offset</code>, <code>ConstOffset</code>, or <code>ConstOffsets</code> the offset value <strong class=\"purple\">must</strong> be less than or equal to <a href=\"#limits-maxTexelGatherOffset\">maxTexelGatherOffset</a>"
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpImageSample-06435",
-          "text": " If an <code>OpImageSample*</code> or <code>OpImageFetch*</code> operation has an image operand of <code>ConstOffset</code> then the offset value <strong class=\"purple\">must</strong> be greater than or equal to <a href=\"#limits-minTexelOffset\"><code>minTexelOffset</code></a>"
+          "text": " If an <code>OpImageSample*</code> or <code>OpImageFetch*</code> operation has an image operand of <code>ConstOffset</code> then the offset value <strong class=\"purple\">must</strong> be greater than or equal to <a href=\"#limits-minTexelOffset\">minTexelOffset</a>"
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpImageSample-06436",
-          "text": " If an <code>OpImageSample*</code> or <code>OpImageFetch*</code> operation has an image operand of <code>ConstOffset</code> then the offset value <strong class=\"purple\">must</strong> be less than or equal to <a href=\"#limits-maxTexelOffset\"><code>maxTexelOffset</code></a>"
+          "text": " If an <code>OpImageSample*</code> or <code>OpImageFetch*</code> operation has an image operand of <code>ConstOffset</code> then the offset value <strong class=\"purple\">must</strong> be less than or equal to <a href=\"#limits-maxTexelOffset\">maxTexelOffset</a>"
         }
       ],
       "(VK_VERSION_1_2,VK_EXT_descriptor_indexing)": [
         {
           "vuid": "VUID-RuntimeSpirv-NonUniform-06274",
-          "text": " If an instruction loads from or stores to a resource (including atomics and image instructions) and the resource descriptor being accessed is not dynamically uniform, then the operand corresponding to that resource (e.g. the pointer or sampled image operand) <strong class=\"purple\">must</strong> be decorated with <code>NonUniform</code>"
+          "text": " If an instruction loads from or stores to a resource (including atomics and image instructions) and the resource descriptor being accessed is not dynamically uniform, then the operand corresponding to that resource (e.g. the pointer or sampled image operand) <strong class=\"purple\">must</strong> be decorated with <code>NonUniform</code>."
         }
       ],
       "(VK_VERSION_1_1)+(VK_VERSION_1_2,VK_KHR_shader_subgroup_extended_types)": [
@@ -66766,39 +66362,39 @@
       "(VK_VERSION_1_2)": [
         {
           "vuid": "VUID-RuntimeSpirv-subgroupBroadcastDynamicId-06276",
-          "text": " If <a href=\"#features-subgroupBroadcastDynamicId\"><code>subgroupBroadcastDynamicId</code></a> is <code>VK_TRUE</code>, and the shader module version is 1.5 or higher, the &#8220;Index&#8221; for <code>OpGroupNonUniformQuadBroadcast</code> <strong class=\"purple\">must</strong> be dynamically uniform within the derivative group. Otherwise, &#8220;Index&#8221; <strong class=\"purple\">must</strong> be a constant"
+          "text": " If <a href=\"#features-subgroupBroadcastDynamicId\"><code>subgroupBroadcastDynamicId</code></a> is <code>VK_TRUE</code>, and the shader module version is 1.5 or higher, the &#8220;Index&#8221; for <code>OpGroupNonUniformQuadBroadcast</code> <strong class=\"purple\">must</strong> be dynamically uniform within the derivative group. Otherwise, &#8220;Index&#8221; <strong class=\"purple\">must</strong> be a constant."
         },
         {
           "vuid": "VUID-RuntimeSpirv-subgroupBroadcastDynamicId-06277",
-          "text": " If <a href=\"#features-subgroupBroadcastDynamicId\"><code>subgroupBroadcastDynamicId</code></a> is <code>VK_TRUE</code>, and the shader module version is 1.5 or higher, the &#8220;Id&#8221; for <code>OpGroupNonUniformBroadcast</code> <strong class=\"purple\">must</strong> be dynamically uniform within the subgroup. Otherwise, &#8220;Id&#8221; <strong class=\"purple\">must</strong> be a constant"
+          "text": " If <a href=\"#features-subgroupBroadcastDynamicId\"><code>subgroupBroadcastDynamicId</code></a> is <code>VK_TRUE</code>, and the shader module version is 1.5 or higher, the &#8220;Id&#8221; for <code>OpGroupNonUniformBroadcast</code> <strong class=\"purple\">must</strong> be dynamically uniform within the subgroup. Otherwise, &#8220;Id&#8221; <strong class=\"purple\">must</strong> be a constant."
         }
       ],
       "(VK_KHR_shader_atomic_int64)": [
         {
           "vuid": "VUID-RuntimeSpirv-None-06278",
-          "text": " <a href=\"#features-shaderBufferInt64Atomics\"><code>shaderBufferInt64Atomics</code></a> <strong class=\"purple\">must</strong> be enabled for 64-bit integer atomic operations to be supported on a <em>Pointer</em> with a <strong>Storage Class</strong> of <strong>StorageBuffer</strong> or <strong>Uniform</strong>"
+          "text": " <a href=\"#features-shaderBufferInt64Atomics\"><code>shaderBufferInt64Atomics</code></a> <strong class=\"purple\">must</strong> be enabled for 64-bit integer atomic operations to be supported on a <em>Pointer</em> with a <strong>Storage Class</strong> of <strong>StorageBuffer</strong> or <strong>Uniform</strong>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-None-06279",
-          "text": " <a href=\"#features-shaderSharedInt64Atomics\"><code>shaderSharedInt64Atomics</code></a> <strong class=\"purple\">must</strong> be enabled for 64-bit integer atomic operations to be supported on a <em>Pointer</em> with a <strong>Storage Class</strong> of <strong>Workgroup</strong>"
+          "text": " <a href=\"#features-shaderSharedInt64Atomics\"><code>shaderSharedInt64Atomics</code></a> <strong class=\"purple\">must</strong> be enabled for 64-bit integer atomic operations to be supported on a <em>Pointer</em> with a <strong>Storage Class</strong> of <strong>Workgroup</strong>."
         }
       ],
       "(VK_EXT_shader_atomic_float)+!(VK_EXT_shader_atomic_float2)": [
         {
           "vuid": "VUID-RuntimeSpirv-None-06280",
-          "text": " <a href=\"#features-shaderBufferFloat32Atomics\"><code>shaderBufferFloat32Atomics</code></a>, or <a href=\"#features-shaderBufferFloat32AtomicAdd\"><code>shaderBufferFloat32AtomicAdd</code></a>, or <a href=\"#features-shaderBufferFloat64Atomics\"><code>shaderBufferFloat64Atomics</code></a>, or <a href=\"#features-shaderBufferFloat64AtomicAdd\"><code>shaderBufferFloat64AtomicAdd</code></a> <strong class=\"purple\">must</strong> be enabled for floating-point atomic operations to be supported on a <em>Pointer</em> with a <strong>Storage Class</strong> of <strong>StorageBuffer</strong>"
+          "text": " <a href=\"#features-shaderBufferFloat32Atomics\"><code>shaderBufferFloat32Atomics</code></a>, or <a href=\"#features-shaderBufferFloat32AtomicAdd\"><code>shaderBufferFloat32AtomicAdd</code></a>, or <a href=\"#features-shaderBufferFloat64Atomics\"><code>shaderBufferFloat64Atomics</code></a>, or <a href=\"#features-shaderBufferFloat64AtomicAdd\"><code>shaderBufferFloat64AtomicAdd</code></a> <strong class=\"purple\">must</strong> be enabled for floating-point atomic operations to be supported on a <em>Pointer</em> with a <strong>Storage Class</strong> of <strong>StorageBuffer</strong>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-None-06281",
-          "text": " <a href=\"#features-shaderSharedFloat32Atomics\"><code>shaderSharedFloat32Atomics</code></a>, or <a href=\"#features-shaderSharedFloat32AtomicAdd\"><code>shaderSharedFloat32AtomicAdd</code></a>, or <a href=\"#features-shaderSharedFloat64Atomics\"><code>shaderSharedFloat64Atomics</code></a>, or <a href=\"#features-shaderSharedFloat64AtomicAdd\"><code>shaderSharedFloat64AtomicAdd</code></a> <strong class=\"purple\">must</strong> be enabled for floating-point atomic operations to be supported on a <em>Pointer</em> with a <strong>Storage Class</strong> of <strong>Workgroup</strong>"
+          "text": " <a href=\"#features-shaderSharedFloat32Atomics\"><code>shaderSharedFloat32Atomics</code></a>, or <a href=\"#features-shaderSharedFloat32AtomicAdd\"><code>shaderSharedFloat32AtomicAdd</code></a>, or <a href=\"#features-shaderSharedFloat64Atomics\"><code>shaderSharedFloat64Atomics</code></a>, or <a href=\"#features-shaderSharedFloat64AtomicAdd\"><code>shaderSharedFloat64AtomicAdd</code></a> <strong class=\"purple\">must</strong> be enabled for floating-point atomic operations to be supported on a <em>Pointer</em> with a <strong>Storage Class</strong> of <strong>Workgroup</strong>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-None-06282",
-          "text": " <a href=\"#features-shaderImageFloat32Atomics\"><code>shaderImageFloat32Atomics</code></a> or <a href=\"#features-shaderImageFloat32AtomicAdd\"><code>shaderImageFloat32AtomicAdd</code></a> <strong class=\"purple\">must</strong> be enabled for 32-bit floating-point atomic operations to be supported on a <em>Pointer</em> with a <strong>Storage Class</strong> of <strong>Image</strong>"
+          "text": " <a href=\"#features-shaderImageFloat32Atomics\"><code>shaderImageFloat32Atomics</code></a> or <a href=\"#features-shaderImageFloat32AtomicAdd\"><code>shaderImageFloat32AtomicAdd</code></a> <strong class=\"purple\">must</strong> be enabled for 32-bit floating-point atomic operations to be supported on a <em>Pointer</em> with a <strong>Storage Class</strong> of <strong>Image</strong>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-None-06283",
-          "text": " <a href=\"#features-sparseImageFloat32Atomics\"><code>sparseImageFloat32Atomics</code></a> or <a href=\"#features-sparseImageFloat32AtomicAdd\"><code>sparseImageFloat32AtomicAdd</code></a> <strong class=\"purple\">must</strong> be enabled for 32-bit floating-point atomics to be supported on sparse images"
+          "text": " <a href=\"#features-sparseImageFloat32Atomics\"><code>sparseImageFloat32Atomics</code></a> or <a href=\"#features-sparseImageFloat32AtomicAdd\"><code>sparseImageFloat32AtomicAdd</code></a> <strong class=\"purple\">must</strong> be enabled for 32-bit floating-point atomics to be supported on sparse images."
         },
         {
           "vuid": "VUID-RuntimeSpirv-None-06335",
@@ -66812,19 +66408,19 @@
       "(VK_EXT_shader_atomic_float2)": [
         {
           "vuid": "VUID-RuntimeSpirv-None-06284",
-          "text": " <a href=\"#features-shaderBufferFloat32Atomics\"><code>shaderBufferFloat32Atomics</code></a>, or <a href=\"#features-shaderBufferFloat32AtomicAdd\"><code>shaderBufferFloat32AtomicAdd</code></a>, or <a href=\"#features-shaderBufferFloat64Atomics\"><code>shaderBufferFloat64Atomics</code></a>, or <a href=\"#features-shaderBufferFloat64AtomicAdd\"><code>shaderBufferFloat64AtomicAdd</code></a>, or <a href=\"#features-shaderBufferFloat16AtomicMinMax\"><code>shaderBufferFloat16Atomics</code></a>, or <a href=\"#features-shaderBufferFloat16AtomicMinMax\"><code>shaderBufferFloat16AtomicAdd</code></a>, or <a href=\"#features-shaderBufferFloat16AtomicMinMax\"><code>shaderBufferFloat16AtomicMinMax</code></a>, or <a href=\"#features-shaderBufferFloat32AtomicMinMax\"><code>shaderBufferFloat32AtomicMinMax</code></a>, or <a href=\"#features-shaderBufferFloat64AtomicMinMax\"><code>shaderBufferFloat64AtomicMinMax</code></a> <strong class=\"purple\">must</strong> be enabled for floating-point atomic operations to be supported on a <em>Pointer</em> with a <strong>Storage Class</strong> of <strong>StorageBuffer</strong>"
+          "text": " <a href=\"#features-shaderBufferFloat32Atomics\"><code>shaderBufferFloat32Atomics</code></a>, or <a href=\"#features-shaderBufferFloat32AtomicAdd\"><code>shaderBufferFloat32AtomicAdd</code></a>, or <a href=\"#features-shaderBufferFloat64Atomics\"><code>shaderBufferFloat64Atomics</code></a>, or <a href=\"#features-shaderBufferFloat64AtomicAdd\"><code>shaderBufferFloat64AtomicAdd</code></a>, or <a href=\"#features-shaderBufferFloat16AtomicMinMax\"><code>shaderBufferFloat16Atomics</code></a>, or <a href=\"#features-shaderBufferFloat16AtomicMinMax\"><code>shaderBufferFloat16AtomicAdd</code></a>, or <a href=\"#features-shaderBufferFloat16AtomicMinMax\"><code>shaderBufferFloat16AtomicMinMax</code></a>, or <a href=\"#features-shaderBufferFloat32AtomicMinMax\"><code>shaderBufferFloat32AtomicMinMax</code></a>, or <a href=\"#features-shaderBufferFloat64AtomicMinMax\"><code>shaderBufferFloat64AtomicMinMax</code></a> <strong class=\"purple\">must</strong> be enabled for floating-point atomic operations to be supported on a <em>Pointer</em> with a <strong>Storage Class</strong> of <strong>StorageBuffer</strong>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-None-06285",
-          "text": " <a href=\"#features-shaderSharedFloat32Atomics\"><code>shaderSharedFloat32Atomics</code></a>, or <a href=\"#features-shaderSharedFloat32AtomicAdd\"><code>shaderSharedFloat32AtomicAdd</code></a>, or <a href=\"#features-shaderSharedFloat64Atomics\"><code>shaderSharedFloat64Atomics</code></a>, or <a href=\"#features-shaderSharedFloat64AtomicAdd\"><code>shaderSharedFloat64AtomicAdd</code></a>, or <a href=\"#features-shaderBufferFloat16AtomicMinMax\"><code>shaderSharedFloat16Atomics</code></a>, or <a href=\"#features-shaderBufferFloat16AtomicMinMax\"><code>shaderSharedFloat16AtomicAdd</code></a>, or <a href=\"#features-shaderBufferFloat16AtomicMinMax\"><code>shaderSharedFloat16AtomicMinMax</code></a>, or <a href=\"#features-shaderSharedFloat32AtomicMinMax\"><code>shaderSharedFloat32AtomicMinMax</code></a>, or <a href=\"#features-shaderSharedFloat64AtomicMinMax\"><code>shaderSharedFloat64AtomicMinMax</code></a> <strong class=\"purple\">must</strong> be enabled for floating-point atomic operations to be supported on a <em>Pointer</em> with a <strong>Storage Class</strong> of <strong>Workgroup</strong>"
+          "text": " <a href=\"#features-shaderSharedFloat32Atomics\"><code>shaderSharedFloat32Atomics</code></a>, or <a href=\"#features-shaderSharedFloat32AtomicAdd\"><code>shaderSharedFloat32AtomicAdd</code></a>, or <a href=\"#features-shaderSharedFloat64Atomics\"><code>shaderSharedFloat64Atomics</code></a>, or <a href=\"#features-shaderSharedFloat64AtomicAdd\"><code>shaderSharedFloat64AtomicAdd</code></a>, or <a href=\"#features-shaderBufferFloat16AtomicMinMax\"><code>shaderSharedFloat16Atomics</code></a>, or <a href=\"#features-shaderBufferFloat16AtomicMinMax\"><code>shaderSharedFloat16AtomicAdd</code></a>, or <a href=\"#features-shaderBufferFloat16AtomicMinMax\"><code>shaderSharedFloat16AtomicMinMax</code></a>, or <a href=\"#features-shaderSharedFloat32AtomicMinMax\"><code>shaderSharedFloat32AtomicMinMax</code></a>, or <a href=\"#features-shaderSharedFloat64AtomicMinMax\"><code>shaderSharedFloat64AtomicMinMax</code></a> <strong class=\"purple\">must</strong> be enabled for floating-point atomic operations to be supported on a <em>Pointer</em> with a <strong>Storage Class</strong> of <strong>Workgroup</strong>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-None-06286",
-          "text": " <a href=\"#features-shaderImageFloat32Atomics\"><code>shaderImageFloat32Atomics</code></a>, or <a href=\"#features-shaderImageFloat32AtomicAdd\"><code>shaderImageFloat32AtomicAdd</code></a>, or <a href=\"#features-shaderImageFloat32AtomicMinMax\"><code>shaderImageFloat32AtomicMinMax</code></a> <strong class=\"purple\">must</strong> be enabled for 32-bit floating-point atomic operations to be supported on a <em>Pointer</em> with a <strong>Storage Class</strong> of <strong>Image</strong>"
+          "text": " <a href=\"#features-shaderImageFloat32Atomics\"><code>shaderImageFloat32Atomics</code></a>, or <a href=\"#features-shaderImageFloat32AtomicAdd\"><code>shaderImageFloat32AtomicAdd</code></a>, or <a href=\"#features-shaderImageFloat32AtomicMinMax\"><code>shaderImageFloat32AtomicMinMax</code></a> <strong class=\"purple\">must</strong> be enabled for 32-bit floating-point atomic operations to be supported on a <em>Pointer</em> with a <strong>Storage Class</strong> of <strong>Image</strong>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-None-06287",
-          "text": " <a href=\"#features-sparseImageFloat32Atomics\"><code>sparseImageFloat32Atomics</code></a>, or <a href=\"#features-sparseImageFloat32AtomicAdd\"><code>sparseImageFloat32AtomicAdd</code></a>, or <a href=\"#features-sparseImageFloat32AtomicMinMax\"><code>sparseImageFloat32AtomicMinMax</code></a> <strong class=\"purple\">must</strong> be enabled for 32-bit floating-point atomics to be supported on sparse images"
+          "text": " <a href=\"#features-sparseImageFloat32Atomics\"><code>sparseImageFloat32Atomics</code></a>, or <a href=\"#features-sparseImageFloat32AtomicAdd\"><code>sparseImageFloat32AtomicAdd</code></a>, or <a href=\"#features-sparseImageFloat32AtomicMinMax\"><code>sparseImageFloat32AtomicMinMax</code></a> <strong class=\"purple\">must</strong> be enabled for 32-bit floating-point atomics to be supported on sparse images."
         },
         {
           "vuid": "VUID-RuntimeSpirv-None-06337",
@@ -66842,85 +66438,85 @@
       "(VK_EXT_shader_image_atomic_int64)": [
         {
           "vuid": "VUID-RuntimeSpirv-None-06288",
-          "text": " <a href=\"#features-shaderImageInt64Atomics\"><code>shaderImageInt64Atomics</code></a> <strong class=\"purple\">must</strong> be enabled for 64-bit integer atomic operations to be supported on a <em>Pointer</em> with a <strong>Storage Class</strong> of <strong>Image</strong>"
+          "text": " <a href=\"#features-shaderImageInt64Atomics\"><code>shaderImageInt64Atomics</code></a> <strong class=\"purple\">must</strong> be enabled for 64-bit integer atomic operations to be supported on a <em>Pointer</em> with a <strong>Storage Class</strong> of <strong>Image</strong>."
         }
       ],
       "(VK_VERSION_1_2,VK_KHR_shader_float_controls)": [
         {
           "vuid": "VUID-RuntimeSpirv-denormBehaviorIndependence-06289",
-          "text": " If <a href=\"#features-denormBehaviorIndependence\"><code>denormBehaviorIndependence</code></a> is <code>VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_32_BIT_ONLY</code>, then the entry point <strong class=\"purple\">must</strong> use the same denormals execution mode for both 16-bit and 64-bit floating-point types"
+          "text": " If <a href=\"#features-denormBehaviorIndependence\"><code>denormBehaviorIndependence</code></a> is <code>VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_32_BIT_ONLY</code>, then the entry point <strong class=\"purple\">must</strong> use the same denormals execution mode for both 16-bit and 64-bit floating-point types."
         },
         {
           "vuid": "VUID-RuntimeSpirv-denormBehaviorIndependence-06290",
-          "text": " If <a href=\"#features-denormBehaviorIndependence\"><code>denormBehaviorIndependence</code></a> is <code>VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_NONE</code>, then the entry point <strong class=\"purple\">must</strong> use the same denormals execution mode for all floating-point types"
+          "text": " If <a href=\"#features-denormBehaviorIndependence\"><code>denormBehaviorIndependence</code></a> is <code>VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_NONE</code>, then the entry point <strong class=\"purple\">must</strong> use the same denormals execution mode for all floating-point types."
         },
         {
           "vuid": "VUID-RuntimeSpirv-roundingModeIndependence-06291",
-          "text": " If <a href=\"#features-roundingModeIndependence\"><code>roundingModeIndependence</code></a> is <code>VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_32_BIT_ONLY</code>, then the entry point <strong class=\"purple\">must</strong> use the same rounding execution mode for both 16-bit and 64-bit floating-point types"
+          "text": " If <a href=\"#features-roundingModeIndependence\"><code>roundingModeIndependence</code></a> is <code>VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_32_BIT_ONLY</code>, then the entry point <strong class=\"purple\">must</strong> use the same rounding execution mode for both 16-bit and 64-bit floating-point types."
         },
         {
           "vuid": "VUID-RuntimeSpirv-roundingModeIndependence-06292",
-          "text": " If <a href=\"#features-roundingModeIndependence\"><code>roundingModeIndependence</code></a> is <code>VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_NONE</code>, then the entry point <strong class=\"purple\">must</strong> use the same rounding execution mode for all floating-point types"
+          "text": " If <a href=\"#features-roundingModeIndependence\"><code>roundingModeIndependence</code></a> is <code>VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_NONE</code>, then the entry point <strong class=\"purple\">must</strong> use the same rounding execution mode for all floating-point types."
         },
         {
           "vuid": "VUID-RuntimeSpirv-shaderSignedZeroInfNanPreserveFloat16-06293",
-          "text": " If <a href=\"#limits-shaderSignedZeroInfNanPreserveFloat16\"><code>shaderSignedZeroInfNanPreserveFloat16</code></a> is <code>VK_FALSE</code>, then <code>SignedZeroInfNanPreserve</code> for 16-bit floating-point type <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#limits-shaderSignedZeroInfNanPreserveFloat16\"><code>shaderSignedZeroInfNanPreserveFloat16</code></a> is <code>VK_FALSE</code>, then <code>SignedZeroInfNanPreserve</code> for 16-bit floating-point type <strong class=\"purple\">must</strong> not be used."
         },
         {
           "vuid": "VUID-RuntimeSpirv-shaderSignedZeroInfNanPreserveFloat32-06294",
-          "text": " If <a href=\"#limits-shaderSignedZeroInfNanPreserveFloat32\"><code>shaderSignedZeroInfNanPreserveFloat32</code></a> is <code>VK_FALSE</code>, then <code>SignedZeroInfNanPreserve</code> for 32-bit floating-point type <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#limits-shaderSignedZeroInfNanPreserveFloat32\"><code>shaderSignedZeroInfNanPreserveFloat32</code></a> is <code>VK_FALSE</code>, then <code>SignedZeroInfNanPreserve</code> for 32-bit floating-point type <strong class=\"purple\">must</strong> not be used."
         },
         {
           "vuid": "VUID-RuntimeSpirv-shaderSignedZeroInfNanPreserveFloat64-06295",
-          "text": " If <a href=\"#limits-shaderSignedZeroInfNanPreserveFloat64\"><code>shaderSignedZeroInfNanPreserveFloat64</code></a> is <code>VK_FALSE</code>, then <code>SignedZeroInfNanPreserve</code> for 64-bit floating-point type <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#limits-shaderSignedZeroInfNanPreserveFloat64\"><code>shaderSignedZeroInfNanPreserveFloat64</code></a> is <code>VK_FALSE</code>, then <code>SignedZeroInfNanPreserve</code> for 64-bit floating-point type <strong class=\"purple\">must</strong> not be used."
         },
         {
           "vuid": "VUID-RuntimeSpirv-shaderDenormPreserveFloat16-06296",
-          "text": " If <a href=\"#limits-shaderDenormPreserveFloat16\"><code>shaderDenormPreserveFloat16</code></a> is <code>VK_FALSE</code>, then <code>DenormPreserve</code> for 16-bit floating-point type <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#limits-shaderDenormPreserveFloat16\"><code>shaderDenormPreserveFloat16</code></a> is <code>VK_FALSE</code>, then <code>DenormPreserve</code> for 16-bit floating-point type <strong class=\"purple\">must</strong> not be used."
         },
         {
           "vuid": "VUID-RuntimeSpirv-shaderDenormPreserveFloat32-06297",
-          "text": " If <a href=\"#limits-shaderDenormPreserveFloat32\"><code>shaderDenormPreserveFloat32</code></a> is <code>VK_FALSE</code>, then <code>DenormPreserve</code> for 32-bit floating-point type <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#limits-shaderDenormPreserveFloat32\"><code>shaderDenormPreserveFloat32</code></a> is <code>VK_FALSE</code>, then <code>DenormPreserve</code> for 32-bit floating-point type <strong class=\"purple\">must</strong> not be used."
         },
         {
           "vuid": "VUID-RuntimeSpirv-shaderDenormPreserveFloat64-06298",
-          "text": " If <a href=\"#limits-shaderDenormPreserveFloat64\"><code>shaderDenormPreserveFloat64</code></a> is <code>VK_FALSE</code>, then <code>DenormPreserve</code> for 64-bit floating-point type <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#limits-shaderDenormPreserveFloat64\"><code>shaderDenormPreserveFloat64</code></a> is <code>VK_FALSE</code>, then <code>DenormPreserve</code> for 64-bit floating-point type <strong class=\"purple\">must</strong> not be used."
         },
         {
           "vuid": "VUID-RuntimeSpirv-shaderDenormFlushToZeroFloat16-06299",
-          "text": " If <a href=\"#limits-shaderDenormFlushToZeroFloat16\"><code>shaderDenormFlushToZeroFloat16</code></a> is <code>VK_FALSE</code>, then <code>DenormFlushToZero</code> for 16-bit floating-point type <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#limits-shaderDenormFlushToZeroFloat16\"><code>shaderDenormFlushToZeroFloat16</code></a> is <code>VK_FALSE</code>, then <code>DenormFlushToZero</code> for 16-bit floating-point type <strong class=\"purple\">must</strong> not be used."
         },
         {
           "vuid": "VUID-RuntimeSpirv-shaderDenormFlushToZeroFloat32-06300",
-          "text": " If <a href=\"#limits-shaderDenormFlushToZeroFloat32\"><code>shaderDenormFlushToZeroFloat32</code></a> is <code>VK_FALSE</code>, then <code>DenormFlushToZero</code> for 32-bit floating-point type <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#limits-shaderDenormFlushToZeroFloat32\"><code>shaderDenormFlushToZeroFloat32</code></a> is <code>VK_FALSE</code>, then <code>DenormFlushToZero</code> for 32-bit floating-point type <strong class=\"purple\">must</strong> not be used."
         },
         {
           "vuid": "VUID-RuntimeSpirv-shaderDenormFlushToZeroFloat64-06301",
-          "text": " If <a href=\"#limits-shaderDenormFlushToZeroFloat64\"><code>shaderDenormFlushToZeroFloat64</code></a> is <code>VK_FALSE</code>, then <code>DenormFlushToZero</code> for 64-bit floating-point type <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#limits-shaderDenormFlushToZeroFloat64\"><code>shaderDenormFlushToZeroFloat64</code></a> is <code>VK_FALSE</code>, then <code>DenormFlushToZero</code> for 64-bit floating-point type <strong class=\"purple\">must</strong> not be used."
         },
         {
           "vuid": "VUID-RuntimeSpirv-shaderRoundingModeRTEFloat16-06302",
-          "text": " If <a href=\"#limits-shaderRoundingModeRTEFloat16\"><code>shaderRoundingModeRTEFloat16</code></a> is <code>VK_FALSE</code>, then <code>RoundingModeRTE</code> for 16-bit floating-point type <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#limits-shaderRoundingModeRTEFloat16\"><code>shaderRoundingModeRTEFloat16</code></a> is <code>VK_FALSE</code>, then <code>RoundingModeRTE</code> for 16-bit floating-point type <strong class=\"purple\">must</strong> not be used."
         },
         {
           "vuid": "VUID-RuntimeSpirv-shaderRoundingModeRTEFloat32-06303",
-          "text": " If <a href=\"#limits-shaderRoundingModeRTEFloat32\"><code>shaderRoundingModeRTEFloat32</code></a> is <code>VK_FALSE</code>, then <code>RoundingModeRTE</code> for 32-bit floating-point type <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#limits-shaderRoundingModeRTEFloat32\"><code>shaderRoundingModeRTEFloat32</code></a> is <code>VK_FALSE</code>, then <code>RoundingModeRTE</code> for 32-bit floating-point type <strong class=\"purple\">must</strong> not be used."
         },
         {
           "vuid": "VUID-RuntimeSpirv-shaderRoundingModeRTEFloat64-06304",
-          "text": " If <a href=\"#limits-shaderRoundingModeRTEFloat64\"><code>shaderRoundingModeRTEFloat64</code></a> is <code>VK_FALSE</code>, then <code>RoundingModeRTE</code> for 64-bit floating-point type <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#limits-shaderRoundingModeRTEFloat64\"><code>shaderRoundingModeRTEFloat64</code></a> is <code>VK_FALSE</code>, then <code>RoundingModeRTE</code> for 64-bit floating-point type <strong class=\"purple\">must</strong> not be used."
         },
         {
           "vuid": "VUID-RuntimeSpirv-shaderRoundingModeRTZFloat16-06305",
-          "text": " If <a href=\"#limits-shaderRoundingModeRTZFloat16\"><code>shaderRoundingModeRTZFloat16</code></a> is <code>VK_FALSE</code>, then <code>RoundingModeRTZ</code> for 16-bit floating-point type <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#limits-shaderRoundingModeRTZFloat16\"><code>shaderRoundingModeRTZFloat16</code></a> is <code>VK_FALSE</code>, then <code>RoundingModeRTZ</code> for 16-bit floating-point type <strong class=\"purple\">must</strong> not be used."
         },
         {
           "vuid": "VUID-RuntimeSpirv-shaderRoundingModeRTZFloat32-06306",
-          "text": " If <a href=\"#limits-shaderRoundingModeRTZFloat32\"><code>shaderRoundingModeRTZFloat32</code></a> is <code>VK_FALSE</code>, then <code>RoundingModeRTZ</code> for 32-bit floating-point type <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#limits-shaderRoundingModeRTZFloat32\"><code>shaderRoundingModeRTZFloat32</code></a> is <code>VK_FALSE</code>, then <code>RoundingModeRTZ</code> for 32-bit floating-point type <strong class=\"purple\">must</strong> not be used."
         },
         {
           "vuid": "VUID-RuntimeSpirv-shaderRoundingModeRTZFloat64-06307",
-          "text": " If <a href=\"#limits-shaderRoundingModeRTZFloat64\"><code>shaderRoundingModeRTZFloat64</code></a> is <code>VK_FALSE</code>, then <code>RoundingModeRTZ</code> for 64-bit floating-point type <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#limits-shaderRoundingModeRTZFloat64\"><code>shaderRoundingModeRTZFloat64</code></a> is <code>VK_FALSE</code>, then <code>RoundingModeRTZ</code> for 64-bit floating-point type <strong class=\"purple\">must</strong> not be used."
         }
       ],
       "(VK_EXT_transform_feedback)": [
@@ -66952,61 +66548,61 @@
       "(VK_VERSION_1_2,VK_EXT_buffer_device_address,VK_KHR_buffer_device_address)": [
         {
           "vuid": "VUID-RuntimeSpirv-PhysicalStorageBuffer64-06314",
-          "text": " If the <code>PhysicalStorageBuffer64</code> addressing model is enabled any load or store through a physical pointer type <strong class=\"purple\">must</strong> be aligned to a multiple of the size of the largest scalar type in the pointed-to type"
+          "text": " If the <code>PhysicalStorageBuffer64</code> addressing model is enabled any load or store through a physical pointer type <strong class=\"purple\">must</strong> be aligned to a multiple of the size of the largest scalar type in the pointed-to type."
         },
         {
           "vuid": "VUID-RuntimeSpirv-PhysicalStorageBuffer64-06315",
-          "text": " If the <code>PhysicalStorageBuffer64</code> addressing model is enabled the pointer value of a memory access instruction <strong class=\"purple\">must</strong> be at least as aligned as specified by the <code>Aligned</code> memory access operand"
+          "text": " If the <code>PhysicalStorageBuffer64</code> addressing model is enabled the pointer value of a memory access instruction <strong class=\"purple\">must</strong> be at least as aligned as specified by the <code>Aligned</code> memory access operand."
         }
       ],
       "(VK_NV_cooperative_matrix)": [
         {
           "vuid": "VUID-RuntimeSpirv-OpTypeCooperativeMatrixNV-06316",
-          "text": " For <code>OpTypeCooperativeMatrixNV</code>, the component type, scope, number of rows, and number of columns <strong class=\"purple\">must</strong> match one of the matrices in any of the supported <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>"
+          "text": " For <code>OpTypeCooperativeMatrixNV</code>, the component type, scope, number of rows, and number of columns <strong class=\"purple\">must</strong> match one of the matrices in any of the supported <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpCooperativeMatrixMulAddNV-06317",
-          "text": " For <code>OpCooperativeMatrixMulAddNV</code>, the type of <code>A</code> <strong class=\"purple\">must</strong> have <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>MSize</code> rows and <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>KSize</code> columns and have a component type that matches <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>AType</code>"
+          "text": " For <code>OpCooperativeMatrixMulAddNV</code>, the type of <code>A</code> <strong class=\"purple\">must</strong> have <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>MSize</code> rows and <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>KSize</code> columns and have a component type that matches <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>AType</code>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpCooperativeMatrixMulAddNV-06318",
-          "text": " For <code>OpCooperativeMatrixMulAddNV</code>, the type of <code>B</code> <strong class=\"purple\">must</strong> have <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>KSize</code> rows and <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>NSize</code> columns and have a component type that matches <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>BType</code>"
+          "text": " For <code>OpCooperativeMatrixMulAddNV</code>, the type of <code>B</code> <strong class=\"purple\">must</strong> have <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>KSize</code> rows and <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>NSize</code> columns and have a component type that matches <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>BType</code>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpCooperativeMatrixMulAddNV-06319",
-          "text": " For <code>OpCooperativeMatrixMulAddNV</code>, the type of <code>C</code> <strong class=\"purple\">must</strong> have <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>MSize</code> rows and <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>NSize</code> columns and have a component type that matches <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>CType</code>"
+          "text": " For <code>OpCooperativeMatrixMulAddNV</code>, the type of <code>C</code> <strong class=\"purple\">must</strong> have <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>MSize</code> rows and <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>NSize</code> columns and have a component type that matches <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>CType</code>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpCooperativeMatrixMulAddNV-06320",
-          "text": " For <code>OpCooperativeMatrixMulAddNV</code>, the type of <code>Result</code> <strong class=\"purple\">must</strong> have <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>MSize</code> rows and <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>NSize</code> columns and have a component type that matches <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>DType</code>"
+          "text": " For <code>OpCooperativeMatrixMulAddNV</code>, the type of <code>Result</code> <strong class=\"purple\">must</strong> have <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>MSize</code> rows and <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>NSize</code> columns and have a component type that matches <a href=\"#VkCooperativeMatrixPropertiesNV\">VkCooperativeMatrixPropertiesNV</a>::<code>DType</code>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpCooperativeMatrixMulAddNV-06321",
-          "text": " For <code>OpCooperativeMatrixMulAddNV</code>, the type of <code>A</code>, <code>B</code>, <code>C</code>, and <code>Result</code> <strong class=\"purple\">must</strong> all have a scope of <code>scope</code>"
+          "text": " For <code>OpCooperativeMatrixMulAddNV</code>, the type of <code>A</code>, <code>B</code>, <code>C</code>, and <code>Result</code> <strong class=\"purple\">must</strong> all have a scope of <code>scope</code>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpTypeCooperativeMatrixNV-06322",
-          "text": " <code>OpTypeCooperativeMatrixNV</code> and <code>OpCooperativeMatrix*</code> instructions <strong class=\"purple\">must</strong> not be used in shader stages not included in <a href=\"#VkPhysicalDeviceCooperativeMatrixPropertiesNV\">VkPhysicalDeviceCooperativeMatrixPropertiesNV</a>::<code>cooperativeMatrixSupportedStages</code>"
+          "text": " <code>OpTypeCooperativeMatrixNV</code> and <code>OpCooperativeMatrix*</code> instructions <strong class=\"purple\">must</strong> not be used in shader stages not included in <a href=\"#VkPhysicalDeviceCooperativeMatrixPropertiesNV\">VkPhysicalDeviceCooperativeMatrixPropertiesNV</a>::<code>cooperativeMatrixSupportedStages</code>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpCooperativeMatrixLoadNV-06324",
-          "text": " For <code>OpCooperativeMatrixLoadNV</code> and <code>OpCooperativeMatrixStoreNV</code> instructions, the <code>Pointer</code> and <code>Stride</code> operands <strong class=\"purple\">must</strong> be aligned to at least the lesser of 16 bytes or the natural alignment of a row or column (depending on <code>ColumnMajor</code>) of the matrix (where the natural alignment is the number of columns/rows multiplied by the component size)"
+          "text": " For <code>OpCooperativeMatrixLoadNV</code> and <code>OpCooperativeMatrixStoreNV</code> instructions, the <code>Pointer</code> and <code>Stride</code> operands <strong class=\"purple\">must</strong> be aligned to at least the lesser of 16 bytes or the natural alignment of a row or column (depending on <code>ColumnMajor</code>) of the matrix (where the natural alignment is the number of columns/rows multiplied by the component size)."
         }
       ],
       "(VK_NV_mesh_shader)": [
         {
           "vuid": "VUID-RuntimeSpirv-MeshNV-07113",
-          "text": " For mesh shaders using the <code>MeshNV</code> {ExecutionModel} the <code>OutputVertices</code> <code>OpExecutionMode</code> <strong class=\"purple\">must</strong> be less than or equal to <code>VkPhysicalDeviceMeshShaderPropertiesNV</code>::<code>maxMeshOutputVertices</code>"
+          "text": " For mesh shaders using the <code>MeshNV</code> {ExecutionModel} the <code>OutputVertices</code> <code>OpExecutionMode</code> <strong class=\"purple\">must</strong> be less than or equal to <code>VkPhysicalDeviceMeshShaderPropertiesNV</code>::<code>maxMeshOutputVertices</code>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-MeshNV-07114",
-          "text": " For mesh shaders using the <code>MeshNV</code> {ExecutionModel} the <code>OutputPrimitivesNV</code> <code>OpExecutionMode</code> <strong class=\"purple\">must</strong> be less than or equal to <code>VkPhysicalDeviceMeshShaderPropertiesNV</code>::<code>maxMeshOutputPrimitives</code>"
+          "text": " For mesh shaders using the <code>MeshNV</code> {ExecutionModel} the <code>OutputPrimitivesNV</code> <code>OpExecutionMode</code> <strong class=\"purple\">must</strong> be less than or equal to <code>VkPhysicalDeviceMeshShaderPropertiesNV</code>::<code>maxMeshOutputPrimitives</code>."
         }
       ],
       "(VK_EXT_mesh_shader)": [
         {
           "vuid": "VUID-RuntimeSpirv-MeshEXT-07115",
-          "text": " For mesh shaders using the <code>MeshEXT</code> {ExecutionModel} the <code>OutputVertices</code> <code>OpExecutionMode</code> <strong class=\"purple\">must</strong> be less than or equal to <code>VkPhysicalDeviceMeshShaderPropertiesEXT</code>::<code>maxMeshOutputVertices</code>"
+          "text": " For mesh shaders using the <code>MeshEXT</code> {ExecutionModel} the <code>OutputVertices</code> <code>OpExecutionMode</code> <strong class=\"purple\">must</strong> be less than or equal to <code>VkPhysicalDeviceMeshShaderPropertiesEXT</code>::<code>maxMeshOutputVertices</code>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-MeshEXT-07332",
@@ -67014,7 +66610,7 @@
         },
         {
           "vuid": "VUID-RuntimeSpirv-MeshEXT-07116",
-          "text": " For mesh shaders using the <code>MeshEXT</code> {ExecutionModel} the <code>OutputPrimitivesEXT</code> <code>OpExecutionMode</code> <strong class=\"purple\">must</strong> be less than or equal to <code>VkPhysicalDeviceMeshShaderPropertiesEXT</code>::<code>maxMeshOutputPrimitives</code>"
+          "text": " For mesh shaders using the <code>MeshEXT</code> {ExecutionModel} the <code>OutputPrimitivesEXT</code> <code>OpExecutionMode</code> <strong class=\"purple\">must</strong> be less than or equal to <code>VkPhysicalDeviceMeshShaderPropertiesEXT</code>::<code>maxMeshOutputPrimitives</code>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-MeshEXT-07333",
@@ -67080,75 +66676,75 @@
       "(VK_KHR_portability_subset)": [
         {
           "vuid": "VUID-RuntimeSpirv-shaderSampleRateInterpolationFunctions-06325",
-          "text": " If the <code><a href=\"#VK_KHR_portability_subset\">VK_KHR_portability_subset</a></code> extension is enabled, and <a href=\"#VkPhysicalDevicePortabilitySubsetFeaturesKHR\">VkPhysicalDevicePortabilitySubsetFeaturesKHR</a>::<code>shaderSampleRateInterpolationFunctions</code> is <code>VK_FALSE</code>, then <code>GLSL.std.450</code> fragment interpolation functions are not supported by the implementation and <code>OpCapability</code> <strong class=\"purple\">must</strong> not be set to <code>InterpolationFunction</code>"
+          "text": " If the <code><a href=\"#VK_KHR_portability_subset\">VK_KHR_portability_subset</a></code> extension is enabled, and <a href=\"#VkPhysicalDevicePortabilitySubsetFeaturesKHR\">VkPhysicalDevicePortabilitySubsetFeaturesKHR</a>::<code>shaderSampleRateInterpolationFunctions</code> is <code>VK_FALSE</code>, then <code>GLSL.std.450</code> fragment interpolation functions are not supported by the implementation and <code>OpCapability</code> <strong class=\"purple\">must</strong> not be set to <code>InterpolationFunction</code>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-tessellationShader-06326",
-          "text": " If <a href=\"#features-tessellationShader\"><code>tessellationShader</code></a> is enabled, and the <code><a href=\"#VK_KHR_portability_subset\">VK_KHR_portability_subset</a></code> extension is enabled, and <a href=\"#VkPhysicalDevicePortabilitySubsetFeaturesKHR\">VkPhysicalDevicePortabilitySubsetFeaturesKHR</a>::<code>tessellationIsolines</code> is <code>VK_FALSE</code>, then <code>OpExecutionMode</code> <strong class=\"purple\">must</strong> not be set to <code>IsoLines</code>"
+          "text": " If <a href=\"#features-tessellationShader\"><code>tessellationShader</code></a> is enabled, and the <code><a href=\"#VK_KHR_portability_subset\">VK_KHR_portability_subset</a></code> extension is enabled, and <a href=\"#VkPhysicalDevicePortabilitySubsetFeaturesKHR\">VkPhysicalDevicePortabilitySubsetFeaturesKHR</a>::<code>tessellationIsolines</code> is <code>VK_FALSE</code>, then <code>OpExecutionMode</code> <strong class=\"purple\">must</strong> not be set to <code>IsoLines</code>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-tessellationShader-06327",
-          "text": " If <a href=\"#features-tessellationShader\"><code>tessellationShader</code></a> is enabled, and the <code><a href=\"#VK_KHR_portability_subset\">VK_KHR_portability_subset</a></code> extension is enabled, and <a href=\"#VkPhysicalDevicePortabilitySubsetFeaturesKHR\">VkPhysicalDevicePortabilitySubsetFeaturesKHR</a>::<code>tessellationPointMode</code> is <code>VK_FALSE</code>, then <code>OpExecutionMode</code> <strong class=\"purple\">must</strong> not be set to <code>PointMode</code>"
+          "text": " If <a href=\"#features-tessellationShader\"><code>tessellationShader</code></a> is enabled, and the <code><a href=\"#VK_KHR_portability_subset\">VK_KHR_portability_subset</a></code> extension is enabled, and <a href=\"#VkPhysicalDevicePortabilitySubsetFeaturesKHR\">VkPhysicalDevicePortabilitySubsetFeaturesKHR</a>::<code>tessellationPointMode</code> is <code>VK_FALSE</code>, then <code>OpExecutionMode</code> <strong class=\"purple\">must</strong> not be set to <code>PointMode</code>."
         }
       ],
       "(VK_KHR_8bit_storage)": [
         {
           "vuid": "VUID-RuntimeSpirv-storageBuffer8BitAccess-06328",
-          "text": " If <a href=\"#features-storageBuffer8BitAccess\"><code>storageBuffer8BitAccess</code></a> is <code>VK_FALSE</code>, then objects containing an 8-bit integer element <strong class=\"purple\">must</strong> not have storage class of <strong>StorageBuffer</strong>, <strong>ShaderRecordBufferKHR</strong>, or <strong>PhysicalStorageBuffer</strong>"
+          "text": " If <a href=\"#features-storageBuffer8BitAccess\"><code>storageBuffer8BitAccess</code></a> is <code>VK_FALSE</code>, then objects containing an 8-bit integer element <strong class=\"purple\">must</strong> not have storage class of <strong>StorageBuffer</strong>, <strong>ShaderRecordBufferKHR</strong>, or <strong>PhysicalStorageBuffer</strong>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-uniformAndStorageBuffer8BitAccess-06329",
-          "text": " If <a href=\"#features-uniformAndStorageBuffer8BitAccess\"><code>uniformAndStorageBuffer8BitAccess</code></a> is <code>VK_FALSE</code>, then objects in the <strong>Uniform</strong> storage class with the <strong>Block</strong> decoration <strong class=\"purple\">must</strong> not have an 8-bit integer member"
+          "text": " If <a href=\"#features-uniformAndStorageBuffer8BitAccess\"><code>uniformAndStorageBuffer8BitAccess</code></a> is <code>VK_FALSE</code>, then objects in the <strong>Uniform</strong> storage class with the <strong>Block</strong> decoration <strong class=\"purple\">must</strong> not have an 8-bit integer member."
         },
         {
           "vuid": "VUID-RuntimeSpirv-storagePushConstant8-06330",
-          "text": " If <a href=\"#features-storagePushConstant8\"><code>storagePushConstant8</code></a> is <code>VK_FALSE</code>, then objects containing an 8-bit integer element <strong class=\"purple\">must</strong> not have storage class of <strong>PushConstant</strong>"
+          "text": " If <a href=\"#features-storagePushConstant8\"><code>storagePushConstant8</code></a> is <code>VK_FALSE</code>, then objects containing an 8-bit integer element <strong class=\"purple\">must</strong> not have storage class of <strong>PushConstant</strong>."
         }
       ],
       "(VK_KHR_16bit_storage)": [
         {
           "vuid": "VUID-RuntimeSpirv-storageBuffer16BitAccess-06331",
-          "text": " If <a href=\"#features-storageBuffer16BitAccess\"><code>storageBuffer16BitAccess</code></a> is <code>VK_FALSE</code>, then objects containing 16-bit integer or 16-bit floating-point elements <strong class=\"purple\">must</strong> not have storage class of <strong>StorageBuffer</strong>, <strong>ShaderRecordBufferKHR</strong>, or <strong>PhysicalStorageBuffer</strong>"
+          "text": " If <a href=\"#features-storageBuffer16BitAccess\"><code>storageBuffer16BitAccess</code></a> is <code>VK_FALSE</code>, then objects containing 16-bit integer or 16-bit floating-point elements <strong class=\"purple\">must</strong> not have storage class of <strong>StorageBuffer</strong>, <strong>ShaderRecordBufferKHR</strong>, or <strong>PhysicalStorageBuffer</strong>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-uniformAndStorageBuffer16BitAccess-06332",
-          "text": " If <a href=\"#features-uniformAndStorageBuffer16BitAccess\"><code>uniformAndStorageBuffer16BitAccess</code></a> is <code>VK_FALSE</code>, then objects in the <strong>Uniform</strong> storage class with the <strong>Block</strong> decoration <strong class=\"purple\">must</strong> not have 16-bit integer or 16-bit floating-point members"
+          "text": " If <a href=\"#features-uniformAndStorageBuffer16BitAccess\"><code>uniformAndStorageBuffer16BitAccess</code></a> is <code>VK_FALSE</code>, then objects in the <strong>Uniform</strong> storage class with the <strong>Block</strong> decoration <strong class=\"purple\">must</strong> not have 16-bit integer or 16-bit floating-point members."
         },
         {
           "vuid": "VUID-RuntimeSpirv-storagePushConstant16-06333",
-          "text": " If <a href=\"#features-storagePushConstant16\"><code>storagePushConstant16</code></a> is <code>VK_FALSE</code>, then objects containing 16-bit integer or 16-bit floating-point elements <strong class=\"purple\">must</strong> not have storage class of <strong>PushConstant</strong>"
+          "text": " If <a href=\"#features-storagePushConstant16\"><code>storagePushConstant16</code></a> is <code>VK_FALSE</code>, then objects containing 16-bit integer or 16-bit floating-point elements <strong class=\"purple\">must</strong> not have storage class of <strong>PushConstant</strong>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-storageInputOutput16-06334",
-          "text": " If <a href=\"#features-storageInputOutput16\"><code>storageInputOutput16</code></a> is <code>VK_FALSE</code>, then objects containing 16-bit integer or 16-bit floating-point elements <strong class=\"purple\">must</strong> not have storage class of <strong>Input</strong> or <strong>Output</strong>"
+          "text": " If <a href=\"#features-storageInputOutput16\"><code>storageInputOutput16</code></a> is <code>VK_FALSE</code>, then objects containing 16-bit integer or 16-bit floating-point elements <strong class=\"purple\">must</strong> not have storage class of <strong>Input</strong> or <strong>Output</strong>."
         }
       ],
       "(VK_VERSION_1_1)": [
         {
           "vuid": "VUID-RuntimeSpirv-None-06343",
-          "text": " <a href=\"#shaders-group-operations\">Group operations</a> with <a href=\"#shaders-scope-subgroup\">subgroup scope</a> <strong class=\"purple\">must</strong> not be used if the shader stage is not in <a href=\"#limits-subgroupSupportedStages\"><code>subgroupSupportedStages</code></a>"
+          "text": " <a href=\"#shaders-group-operations\">Group operations</a> with <a href=\"#shaders-scope-subgroup\">subgroup scope</a> <strong class=\"purple\">must</strong> not be used if the shader stage is not in <a href=\"#limits-subgroupSupportedStages\">subgroupSupportedStages</a>."
         }
       ],
       "(VK_KHR_ray_query)": [
         {
           "vuid": "VUID-RuntimeSpirv-OpRayQueryInitializeKHR-06348",
-          "text": " For <code>OpRayQueryInitializeKHR</code> instructions, all components of the <code>RayOrigin</code> and <code>RayDirection</code> operands <strong class=\"purple\">must</strong> be finite floating-point values"
+          "text": " For <code>OpRayQueryInitializeKHR</code> instructions, all components of the <code>RayOrigin</code> and <code>RayDirection</code> operands <strong class=\"purple\">must</strong> be finite floating-point values."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpRayQueryInitializeKHR-06349",
-          "text": " For <code>OpRayQueryInitializeKHR</code> instructions, the <code>RayTmin</code> and <code>RayTmax</code> operands <strong class=\"purple\">must</strong> be non-negative floating-point values"
+          "text": " For <code>OpRayQueryInitializeKHR</code> instructions, the <code>RayTmin</code> and <code>RayTmax</code> operands <strong class=\"purple\">must</strong> be non-negative floating-point values."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpRayQueryInitializeKHR-06350",
-          "text": " For <code>OpRayQueryInitializeKHR</code> instructions, the <code>RayTmin</code> operand <strong class=\"purple\">must</strong> be less than or equal to the <code>RayTmax</code> operand"
+          "text": " For <code>OpRayQueryInitializeKHR</code> instructions, the <code>RayTmin</code> operand <strong class=\"purple\">must</strong> be less than or equal to the <code>RayTmax</code> operand."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpRayQueryInitializeKHR-06351",
-          "text": " For <code>OpRayQueryInitializeKHR</code> instructions, <code>RayOrigin</code>, <code>RayDirection</code>, <code>RayTmin</code>, and <code>RayTmax</code> operands <strong class=\"purple\">must</strong> not contain NaNs"
+          "text": " For <code>OpRayQueryInitializeKHR</code> instructions, <code>RayOrigin</code>, <code>RayDirection</code>, <code>RayTmin</code>, and <code>RayTmax</code> operands <strong class=\"purple\">must</strong> not contain NaNs."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpRayQueryInitializeKHR-06352",
-          "text": " For <code>OpRayQueryInitializeKHR</code> instructions, <code>Acceleration</code> <code>Structure</code> <strong class=\"purple\">must</strong> be an acceleration structure built as a <a href=\"#acceleration-structure-top-level\">top-level acceleration structure</a>"
+          "text": " For <code>OpRayQueryInitializeKHR</code> instructions, <code>Acceleration</code> <code>Structure</code> <strong class=\"purple\">must</strong> be an acceleration structure built as a <a href=\"#acceleration-structure-top-level\">top-level acceleration structure</a>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpRayQueryInitializeKHR-06889",
@@ -67164,23 +66760,23 @@
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpRayQueryGenerateIntersectionKHR-06353",
-          "text": " For <code>OpRayQueryGenerateIntersectionKHR</code> instructions, <code>Hit</code> <code>T</code> <strong class=\"purple\">must</strong> satisfy the condition <span class=\"eq\"><code>RayTmin</code> {leq} <code>Hit</code> <code>T</code> {leq} <code>RayTmax</code></span>, where <code>RayTmin</code> is equal to the value returned by <code>OpRayQueryGetRayTMinKHR</code> with the same ray query object, and <code>RayTmax</code> is equal to the value of <code>OpRayQueryGetIntersectionTKHR</code> for the current committed intersection with the same ray query object"
+          "text": " For <code>OpRayQueryGenerateIntersectionKHR</code> instructions, <code>Hit</code> <code>T</code> <strong class=\"purple\">must</strong> satisfy the condition <span class=\"eq\"><code>RayTmin</code> {leq} <code>Hit</code> <code>T</code> {leq} <code>RayTmax</code></span>, where <code>RayTmin</code> is equal to the value returned by <code>OpRayQueryGetRayTMinKHR</code> with the same ray query object, and <code>RayTmax</code> is equal to the value of <code>OpRayQueryGetIntersectionTKHR</code> for the current committed intersection with the same ray query object."
         }
       ],
       "(VK_KHR_ray_query)+(VK_NV_ray_tracing_motion_blur)": [
         {
           "vuid": "VUID-RuntimeSpirv-OpRayQueryGenerateIntersectionKHR-06354",
-          "text": " For <code>OpRayQueryGenerateIntersectionKHR</code> instructions, <code>Acceleration</code> <code>Structure</code> <strong class=\"purple\">must</strong> not be built with <code>VK_BUILD_ACCELERATION_STRUCTURE_MOTION_BIT_NV</code> in <code>flags</code>"
+          "text": " For <code>OpRayQueryGenerateIntersectionKHR</code> instructions, <code>Acceleration</code> <code>Structure</code> <strong class=\"purple\">must</strong> not be built with <code>VK_BUILD_ACCELERATION_STRUCTURE_MOTION_BIT_NV</code> in <code>flags</code>."
         }
       ],
       "(VK_KHR_ray_tracing_pipeline)": [
         {
           "vuid": "VUID-RuntimeSpirv-OpTraceRayKHR-06355",
-          "text": " For <code>OpTraceRayKHR</code> instructions, all components of the <code>RayOrigin</code> and <code>RayDirection</code> operands <strong class=\"purple\">must</strong> be finite floating-point values"
+          "text": " For <code>OpTraceRayKHR</code> instructions, all components of the <code>RayOrigin</code> and <code>RayDirection</code> operands <strong class=\"purple\">must</strong> be finite floating-point values."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpTraceRayKHR-06356",
-          "text": " For <code>OpTraceRayKHR</code> instructions, the <code>RayTmin</code> and <code>RayTmax</code> operands <strong class=\"purple\">must</strong> be non-negative floating-point values"
+          "text": " For <code>OpTraceRayKHR</code> instructions, the <code>RayTmin</code> and <code>RayTmax</code> operands <strong class=\"purple\">must</strong> be non-negative floating-point values."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpTraceRayKHR-06552",
@@ -67204,15 +66800,15 @@
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpTraceRayKHR-06357",
-          "text": " For <code>OpTraceRayKHR</code> instructions, the <code>RayTmin</code> operand <strong class=\"purple\">must</strong> be less than or equal to the <code>RayTmax</code> operand"
+          "text": " For <code>OpTraceRayKHR</code> instructions, the <code>RayTmin</code> operand <strong class=\"purple\">must</strong> be less than or equal to the <code>RayTmax</code> operand."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpTraceRayKHR-06358",
-          "text": " For <code>OpTraceRayKHR</code> instructions, <code>RayOrigin</code>, <code>RayDirection</code>, <code>RayTmin</code>, and <code>RayTmax</code> operands <strong class=\"purple\">must</strong> not contain NaNs"
+          "text": " For <code>OpTraceRayKHR</code> instructions, <code>RayOrigin</code>, <code>RayDirection</code>, <code>RayTmin</code>, and <code>RayTmax</code> operands <strong class=\"purple\">must</strong> not contain NaNs."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpTraceRayKHR-06359",
-          "text": " For <code>OpTraceRayKHR</code> instructions, <code>Acceleration</code> <code>Structure</code> <strong class=\"purple\">must</strong> be an acceleration structure built as a <a href=\"#acceleration-structure-top-level\">top-level acceleration structure</a>"
+          "text": " For <code>OpTraceRayKHR</code> instructions, <code>Acceleration</code> <code>Structure</code> <strong class=\"purple\">must</strong> be an acceleration structure built as a <a href=\"#acceleration-structure-top-level\">top-level acceleration structure</a>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpReportIntersectionKHR-06998",
@@ -67226,19 +66822,19 @@
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpTraceRayMotionNV-06361",
-          "text": " For <code>OpTraceRayMotionNV</code> instructions, all components of the <code>RayOrigin</code> and <code>RayDirection</code> operands <strong class=\"purple\">must</strong> be finite floating-point values"
+          "text": " For <code>OpTraceRayMotionNV</code> instructions, all components of the <code>RayOrigin</code> and <code>RayDirection</code> operands <strong class=\"purple\">must</strong> be finite floating-point values."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpTraceRayMotionNV-06362",
-          "text": " For <code>OpTraceRayMotionNV</code> instructions, the <code>RayTmin</code> and <code>RayTmax</code> operands <strong class=\"purple\">must</strong> be non-negative floating-point values"
+          "text": " For <code>OpTraceRayMotionNV</code> instructions, the <code>RayTmin</code> and <code>RayTmax</code> operands <strong class=\"purple\">must</strong> be non-negative floating-point values."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpTraceRayMotionNV-06363",
-          "text": " For <code>OpTraceRayMotionNV</code> instructions, the <code>RayTmin</code> operand <strong class=\"purple\">must</strong> be less than or equal to the <code>RayTmax</code> operand"
+          "text": " For <code>OpTraceRayMotionNV</code> instructions, the <code>RayTmin</code> operand <strong class=\"purple\">must</strong> be less than or equal to the <code>RayTmax</code> operand."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpTraceRayMotionNV-06364",
-          "text": " For <code>OpTraceRayMotionNV</code> instructions, <code>RayOrigin</code>, <code>RayDirection</code>, <code>RayTmin</code>, and <code>RayTmax</code> operands <strong class=\"purple\">must</strong> not contain NaNs"
+          "text": " For <code>OpTraceRayMotionNV</code> instructions, <code>RayOrigin</code>, <code>RayDirection</code>, <code>RayTmin</code>, and <code>RayTmax</code> operands <strong class=\"purple\">must</strong> not contain NaNs."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpTraceRayMotionNV-06365",
@@ -67260,19 +66856,19 @@
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpHitObjectTraceRayNV-07705",
-          "text": " For <code>OpHitObjectTraceRayNV</code> and <code>OpHitObjectTraceRayMotionNV</code> instructions, all components of the <code>RayOrigin</code> and <code>RayDirection</code> operands <strong class=\"purple\">must</strong> be finite floating-point values"
+          "text": " For <code>OpHitObjectTraceRayNV</code> and <code>OpHitObjectTraceRayMotionNV</code> instructions, all components of the <code>RayOrigin</code> and <code>RayDirection</code> operands <strong class=\"purple\">must</strong> be finite floating-point values."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpHitObjectTraceRayNV-07706",
-          "text": " For <code>OpHitObjectTraceRayNV</code> and <code>OpHitObjectTraceRayMotionNV</code> instructions, the <code>RayTmin</code> and <code>RayTmax</code> operands <strong class=\"purple\">must</strong> be non-negative floating-point values"
+          "text": " For <code>OpHitObjectTraceRayNV</code> and <code>OpHitObjectTraceRayMotionNV</code> instructions, the <code>RayTmin</code> and <code>RayTmax</code> operands <strong class=\"purple\">must</strong> be non-negative floating-point values."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpHitObjectTraceRayNV-07707",
-          "text": " For <code>OpHitObjectTraceRayNV</code> and <code>OpHitObjectTraceRayMotionNV</code> instructions, the <code>RayTmin</code> operand <strong class=\"purple\">must</strong> be less than or equal to the <code>RayTmax</code> operand"
+          "text": " For <code>OpHitObjectTraceRayNV</code> and <code>OpHitObjectTraceRayMotionNV</code> instructions, the <code>RayTmin</code> operand <strong class=\"purple\">must</strong> be less than or equal to the <code>RayTmax</code> operand."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpHitObjectTraceRayNV-07708",
-          "text": " For <code>OpHitObjectTraceRayNV</code> and <code>OpHitObjectTraceRayMotionNV</code> instructions, <code>RayOrigin</code>, <code>RayDirection</code>, <code>RayTmin</code>, and <code>RayTmax</code> operands <strong class=\"purple\">must</strong> not contain NaNs"
+          "text": " For <code>OpHitObjectTraceRayNV</code> and <code>OpHitObjectTraceRayMotionNV</code> instructions, <code>RayOrigin</code>, <code>RayDirection</code>, <code>RayTmin</code>, and <code>RayTmax</code> operands <strong class=\"purple\">must</strong> not contain NaNs."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpHitObjectTraceRayMotionNV-07709",
@@ -67342,93 +66938,93 @@
       "(VK_QCOM_render_pass_shader_resolve)": [
         {
           "vuid": "VUID-RuntimeSpirv-SampleRateShading-06378",
-          "text": " If the subpass description contains <code>VK_SUBPASS_DESCRIPTION_FRAGMENT_REGION_BIT_QCOM</code>, then the SPIR-V fragment shader Capability <code>SampleRateShading</code> <strong class=\"purple\">must</strong> not be enabled"
+          "text": " If the subpass description contains <code>VK_SUBPASS_DESCRIPTION_FRAGMENT_REGION_BIT_QCOM</code>, then the SPIR-V fragment shader Capability <code>SampleRateShading</code> <strong class=\"purple\">must</strong> not be enabled."
         }
       ],
       "(VK_KHR_shader_subgroup_uniform_control_flow)": [
         {
           "vuid": "VUID-RuntimeSpirv-SubgroupUniformControlFlowKHR-06379",
-          "text": " The execution mode <code>SubgroupUniformControlFlowKHR</code> <strong class=\"purple\">must</strong> not be applied to an entry point unless <a href=\"#features-shaderSubgroupUniformControlFlow\"><code>shaderSubgroupUniformControlFlow</code></a> is enabled and the corresponding shader stage bit is set in subgroup <a href=\"#limits-subgroup-supportedStages\"><code>supportedStages</code></a> and the entry point does not execute any <a href=\"#ray-tracing-repack\"><em>invocation repack instructions</em></a>"
+          "text": " The execution mode <code>SubgroupUniformControlFlowKHR</code> <strong class=\"purple\">must</strong> not be applied to an entry point unless <a href=\"#features-shaderSubgroupUniformControlFlow\"><code>shaderSubgroupUniformControlFlow</code></a> is enabled and the corresponding shader stage bit is set in subgroup <a href=\"#limits-subgroup-supportedStages\"><code>supportedStages</code></a> and the entry point does not execute any <a href=\"#ray-tracing-repack\"><em>invocation repack instructions</em></a>."
         }
       ],
       "(VK_AMD_shader_early_and_late_fragment_tests)": [
         {
           "vuid": "VUID-RuntimeSpirv-shaderEarlyAndLateFragmentTests-06767",
-          "text": " If <a href=\"#features-shaderEarlyAndLateFragmentTests\"><code>shaderEarlyAndLateFragmentTests</code></a> is not enabled, the <code>EarlyAndLateFragmentTestsEXT</code> <code>Execution</code> <code>Mode</code> <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#features-shaderEarlyAndLateFragmentTests\"><code>shaderEarlyAndLateFragmentTests</code></a> is not enabled, the <code>EarlyAndLateFragmentTestsEXT</code> <code>Execution</code> <code>Mode</code> <strong class=\"purple\">must</strong> not be used."
         },
         {
           "vuid": "VUID-RuntimeSpirv-shaderEarlyAndLateFragmentTests-06768",
-          "text": " If <a href=\"#features-shaderEarlyAndLateFragmentTests\"><code>shaderEarlyAndLateFragmentTests</code></a> feature is not enabled, the <code>StencilRefUnchangedFrontEXT</code> <code>Execution</code> <code>Mode</code> <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#features-shaderEarlyAndLateFragmentTests\"><code>shaderEarlyAndLateFragmentTests</code></a> feature is not enabled, the <code>StencilRefUnchangedFrontEXT</code> <code>Execution</code> <code>Mode</code> <strong class=\"purple\">must</strong> not be used."
         },
         {
           "vuid": "VUID-RuntimeSpirv-shaderEarlyAndLateFragmentTests-06769",
-          "text": " If <a href=\"#features-shaderEarlyAndLateFragmentTests\"><code>shaderEarlyAndLateFragmentTests</code></a> is not enabled, the <code>StencilRefUnchangedBackEXT</code> <code>Execution</code> <code>Mode</code> <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#features-shaderEarlyAndLateFragmentTests\"><code>shaderEarlyAndLateFragmentTests</code></a> is not enabled, the <code>StencilRefUnchangedBackEXT</code> <code>Execution</code> <code>Mode</code> <strong class=\"purple\">must</strong> not be used."
         },
         {
           "vuid": "VUID-RuntimeSpirv-shaderEarlyAndLateFragmentTests-06770",
-          "text": " If <a href=\"#features-shaderEarlyAndLateFragmentTests\"><code>shaderEarlyAndLateFragmentTests</code></a> is not enabled, the <code>StencilRefGreaterFrontEXT</code> <code>Execution</code> <code>Mode</code> <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#features-shaderEarlyAndLateFragmentTests\"><code>shaderEarlyAndLateFragmentTests</code></a> is not enabled, the <code>StencilRefGreaterFrontEXT</code> <code>Execution</code> <code>Mode</code> <strong class=\"purple\">must</strong> not be used."
         },
         {
           "vuid": "VUID-RuntimeSpirv-shaderEarlyAndLateFragmentTests-06771",
-          "text": " If <a href=\"#features-shaderEarlyAndLateFragmentTests\"><code>shaderEarlyAndLateFragmentTests</code></a> is not enabled, the <code>StencilRefGreaterBackEXT</code> <code>Execution</code> <code>Mode</code> <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#features-shaderEarlyAndLateFragmentTests\"><code>shaderEarlyAndLateFragmentTests</code></a> is not enabled, the <code>StencilRefGreaterBackEXT</code> <code>Execution</code> <code>Mode</code> <strong class=\"purple\">must</strong> not be used."
         },
         {
           "vuid": "VUID-RuntimeSpirv-shaderEarlyAndLateFragmentTests-06772",
-          "text": " If <a href=\"#features-shaderEarlyAndLateFragmentTests\"><code>shaderEarlyAndLateFragmentTests</code></a> is not enabled, the <code>StencilRefLessFrontEXT</code> <code>Execution</code> <code>Mode</code> <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#features-shaderEarlyAndLateFragmentTests\"><code>shaderEarlyAndLateFragmentTests</code></a> is not enabled, the <code>StencilRefLessFrontEXT</code> <code>Execution</code> <code>Mode</code> <strong class=\"purple\">must</strong> not be used."
         },
         {
           "vuid": "VUID-RuntimeSpirv-shaderEarlyAndLateFragmentTests-06773",
-          "text": " If <a href=\"#features-shaderEarlyAndLateFragmentTests\"><code>shaderEarlyAndLateFragmentTests</code></a> is not enabled, the <code>StencilRefLessBackEXT</code> <code>Execution</code> <code>Mode</code> <strong class=\"purple\">must</strong> not be used"
+          "text": " If <a href=\"#features-shaderEarlyAndLateFragmentTests\"><code>shaderEarlyAndLateFragmentTests</code></a> is not enabled, the <code>StencilRefLessBackEXT</code> <code>Execution</code> <code>Mode</code> <strong class=\"purple\">must</strong> not be used."
         }
       ],
       "(VK_QCOM_image_processing)": [
         {
           "vuid": "VUID-RuntimeSpirv-OpImageWeightedSampleQCOM-06979",
-          "text": " If an <code>OpImageWeightedSampleQCOM</code> operation is used, then the <code>Texture</code> <code>Sampled</code> <code>Image</code> and <code>Weight</code> <code>Image</code> parameters <strong class=\"purple\">must</strong> both be <em>dynamically uniform</em> for the quad"
+          "text": " If an <code>OpImageWeightedSampleQCOM</code> operation is used, then the <code>Texture</code> <code>Sampled</code> <code>Image</code> and <code>Weight</code> <code>Image</code> parameters <strong class=\"purple\">must</strong> both be <em>dynamically uniform</em> for the quad."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpImageWeightedSampleQCOM-06980",
-          "text": " If an <code>OpImageWeightedSampleQCOM</code> operation is used, then the <code>Weight</code> <code>Image</code> parameter <strong class=\"purple\">must</strong> be of storage class <code>UniformConstant</code> and type <code>OpTypeImage</code> with <code>Depth</code>=0, <code>Dim</code>=<code>2D</code>, <code>Arrayed</code>=1, <code>MS</code>=0, and <code>Sampled</code>=1"
+          "text": " If an <code>OpImageWeightedSampleQCOM</code> operation is used, then the <code>Weight</code> <code>Image</code> parameter <strong class=\"purple\">must</strong> be of storage class <code>UniformConstant</code> and type <code>OpTypeImage</code> with <code>Depth</code>=0, <code>Dim</code>=<code>2D</code>, <code>Arrayed</code>=1, <code>MS</code>=0, and <code>Sampled</code>=1."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpImageWeightedSampleQCOM-06981",
-          "text": " If an <code>OpImageWeightedSampleQCOM</code> operation is used, then the <code>Weight</code> <code>Image</code> parameter <strong class=\"purple\">must</strong> be decorated with <code>WeightTextureQCOM</code>"
+          "text": " If an <code>OpImageWeightedSampleQCOM</code> operation is used, then the <code>Weight</code> <code>Image</code> parameter <strong class=\"purple\">must</strong> be decorated with <code>WeightTextureQCOM</code>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpImageBlockMatchSADQCOM-06982",
-          "text": " If an <code>OpImageBlockMatchSADQCOM</code> or <code>OpImageBlockMatchSSDQCOM</code> operation is used, then the <code>target</code> <code>sampled</code> <code>image</code>, <code>reference</code> <code>sampled</code> <code>image</code>, and <code>Block</code> <code>Size</code> parameters <strong class=\"purple\">must</strong> both be <em>dynamically uniform</em> for the quad"
+          "text": " If an <code>OpImageBlockMatchSADQCOM</code> or <code>OpImageBlockMatchSSDQCOM</code> operation is used, then the <code>target</code> <code>sampled</code> <code>image</code>, <code>reference</code> <code>sampled</code> <code>image</code>, and <code>Block</code> <code>Size</code> parameters <strong class=\"purple\">must</strong> both be <em>dynamically uniform</em> for the quad."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpImageBlockMatchSSDQCOM-06983",
-          "text": " If an <code>OpImageBlockMatchSSDQCOM</code> or <code>OpImageBlockMatchSADQCOM</code> operation is used, then <code>target</code> <code>sampled</code> <code>image</code> and <code>reference</code> <code>sampled</code> <code>image</code> parameters <strong class=\"purple\">must</strong> be of storage class <code>UniformConstant</code> and type <code>OpTypeImage</code> with <code>Depth</code>=0, <code>Dim</code>=<code>2D</code>, <code>Arrayed</code>=0, <code>MS</code>=0, and <code>Sampled</code>=1"
+          "text": " If an <code>OpImageBlockMatchSSDQCOM</code> or <code>OpImageBlockMatchSADQCOM</code> operation is used, then <code>target</code> <code>sampled</code> <code>image</code> and <code>reference</code> <code>sampled</code> <code>image</code> parameters <strong class=\"purple\">must</strong> be of storage class <code>UniformConstant</code> and type <code>OpTypeImage</code> with <code>Depth</code>=0, <code>Dim</code>=<code>2D</code>, <code>Arrayed</code>=0, <code>MS</code>=0, and <code>Sampled</code>=1."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpImageBlockMatchSSDQCOM-06984",
-          "text": " If an <code>OpImageBlockMatchSSDQCOM</code> or <code>OpImageBlockMatchSADQCOM</code> operation is used, then the <code>target</code> <code>sampled</code> <code>image</code> and <code>reference</code> <code>sampled</code> <code>image</code> parameters <strong class=\"purple\">must</strong> be decorated with <code>BlockMatchTextureQCOM</code>"
+          "text": " If an <code>OpImageBlockMatchSSDQCOM</code> or <code>OpImageBlockMatchSADQCOM</code> operation is used, then the <code>target</code> <code>sampled</code> <code>image</code> and <code>reference</code> <code>sampled</code> <code>image</code> parameters <strong class=\"purple\">must</strong> be decorated with <code>BlockMatchTextureQCOM</code>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpImageBlockMatchSSDQCOM-06985",
-          "text": " If an <code>OpImageBlockMatchSSDQCOM</code> or <code>OpImageBlockMatchSADQCOM</code> operation is used, then <code>target</code> <code>sampled</code> <code>image</code> and <code>reference</code> <code>sampled</code> <code>image</code> parameters <strong class=\"purple\">must</strong> have been created using an identical sampler object"
+          "text": " If an <code>OpImageBlockMatchSSDQCOM</code> or <code>OpImageBlockMatchSADQCOM</code> operation is used, then <code>target</code> <code>sampled</code> <code>image</code> and <code>reference</code> <code>sampled</code> <code>image</code> parameters <strong class=\"purple\">must</strong> have been created using an identical sampler object."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpImageBlockMatchSSDQCOM-06986",
-          "text": "    If an <code>OpImageBlockMatchSSDQCOM</code> or <code>OpImageBlockMatchSADQCOM</code>    operation is used, then <code>target</code> <code>sampled</code> <code>image</code> and    <code>reference</code> <code>sampled</code> <code>image</code> parameters <strong class=\"purple\">must</strong> have been    created with sampler object with <code>unnormalizeCordinates</code> equal to <code>VK_TRUE</code>"
+          "text": "    If an <code>OpImageBlockMatchSSDQCOM</code> or <code>OpImageBlockMatchSADQCOM</code>    operation is used, then <code>target</code> <code>sampled</code> <code>image</code> and    <code>reference</code> <code>sampled</code> <code>image</code> parameters <strong class=\"purple\">must</strong> have been    created with sampler object with <code>unnormalizeCordinates</code> equal to <code>VK_TRUE</code>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpImageBlockMatchSSDQCOM-06987",
-          "text": "    If an <code>OpImageBlockMatchSSDQCOM</code> or <code>OpImageBlockMatchSADQCOM</code>    operation is used, then <code>target</code> <code>sampled</code> <code>image</code> and    <code>reference</code> <code>sampled</code> <code>image</code> parameters <strong class=\"purple\">must</strong> have been    created with sampler object with <code>unnormalizeCordinates</code> equal to <code>VK_TRUE</code>"
+          "text": "    If an <code>OpImageBlockMatchSSDQCOM</code> or <code>OpImageBlockMatchSADQCOM</code>    operation is used, then <code>target</code> <code>sampled</code> <code>image</code> and    <code>reference</code> <code>sampled</code> <code>image</code> parameters <strong class=\"purple\">must</strong> have been    created with sampler object with <code>unnormalizeCordinates</code> equal to <code>VK_TRUE</code>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpImageBlockMatchSSDQCOM-06988",
-          "text": " If an <code>OpImageBlockMatchSSDQCOM</code> or <code>OpImageBlockMatchSADQCOM</code> operation is used, then <code>Block</code> <code>Size</code> less than or equal to <a href=\"#limits-blockmatch-maxblocksize\"><code>maxBlockMatchRegion</code></a>"
+          "text": " If an <code>OpImageBlockMatchSSDQCOM</code> or <code>OpImageBlockMatchSADQCOM</code> operation is used, then <code>Block</code> <code>Size</code> less than or equal to <a href=\"#limits-blockmatch-maxblocksize\">maxBlockMatchRegion</a>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpImageBoxFilterQCOM-06989",
-          "text": " If an <code>OpImageBoxFilterQCOM</code> operation is used, then <code>Box</code> <code>Size.y</code> <strong class=\"purple\">must</strong> be equal to or greater than 1.0 and less than or equal to <a href=\"#limits-boxfilter-maxblocksize\"><code>maxBoxFilterBlockSize</code></a>.<code>height</code>"
+          "text": " If an <code>OpImageBoxFilterQCOM</code> operation is used, then <code>Box</code> <code>Size.y</code> <strong class=\"purple\">must</strong> be equal to or greater than 1.0 and less than or equal to <a href=\"#limits-boxfilter-maxblocksize\">maxBoxFilterBlockSize</a>.<code>height</code>."
         },
         {
           "vuid": "VUID-RuntimeSpirv-OpImageBoxFilterQCOM-06990",
-          "text": " If an <code>OpImageBoxFilterQCOM</code> operation is used, then <code>Sampled</code> <code>Texture</code> <code>Image</code> and <code>Box</code> <code>Size</code> parameters <strong class=\"purple\">must</strong> be <em>dynamically uniform</em>"
+          "text": " If an <code>OpImageBoxFilterQCOM</code> operation is used, then <code>Sampled</code> <code>Texture</code> <code>Image</code> and <code>Box</code> <code>Size</code> parameters <strong class=\"purple\">must</strong> be <em>dynamically uniform</em>."
         }
       ]
     },
diff --git a/third_party/vulkan-deps/vulkan-headers/src/registry/vk.xml b/third_party/vulkan-deps/vulkan-headers/src/registry/vk.xml
index 534d1cb..f961463 100644
--- a/third_party/vulkan-deps/vulkan-headers/src/registry/vk.xml
+++ b/third_party/vulkan-deps/vulkan-headers/src/registry/vk.xml
@@ -159,7 +159,7 @@
         <type category="define" requires="VK_MAKE_API_VERSION">// Vulkan 1.3 version number
 #define <name>VK_API_VERSION_1_3</name> <type>VK_MAKE_API_VERSION</type>(0, 1, 3, 0)// Patch version should always be set to 0</type>
         <type category="define">// Version of this file
-#define <name>VK_HEADER_VERSION</name> 236</type>
+#define <name>VK_HEADER_VERSION</name> 235</type>
         <type category="define" requires="VK_HEADER_VERSION">// Complete version of this file
 #define <name>VK_HEADER_VERSION_COMPLETE</name> <type>VK_MAKE_API_VERSION</type>(0, 1, 3, VK_HEADER_VERSION)</type>
 
@@ -355,7 +355,7 @@
         <type                                             category="bitmask" name="VkRenderingFlagsKHR" alias="VkRenderingFlags"/>
         <type requires="VkBuildMicromapFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkBuildMicromapFlagsEXT</name>;</type>
         <type requires="VkMicromapCreateFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkMicromapCreateFlagsEXT</name>;</type>
-        <type                                             category="bitmask">typedef <type>VkFlags</type> <name>VkDirectDriverLoadingFlagsLUNARG</name>;</type>
+
 
             <comment>WSI extensions</comment>
         <type requires="VkCompositeAlphaFlagBitsKHR"      category="bitmask">typedef <type>VkFlags</type> <name>VkCompositeAlphaFlagsKHR</name>;</type>
@@ -529,7 +529,7 @@
         <type category="handle" parent="VkPhysicalDevice" objtypeenum="VK_OBJECT_TYPE_DISPLAY_KHR"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkDisplayKHR</name>)</type>
         <type category="handle" parent="VkDisplayKHR"     objtypeenum="VK_OBJECT_TYPE_DISPLAY_MODE_KHR"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkDisplayModeKHR</name>)</type>
         <type category="handle" parent="VkInstance"       objtypeenum="VK_OBJECT_TYPE_SURFACE_KHR"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkSurfaceKHR</name>)</type>
-        <type category="handle" parent="VkDevice"         objtypeenum="VK_OBJECT_TYPE_SWAPCHAIN_KHR"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkSwapchainKHR</name>)</type>
+        <type category="handle" parent="VkSurfaceKHR"     objtypeenum="VK_OBJECT_TYPE_SWAPCHAIN_KHR"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkSwapchainKHR</name>)</type>
         <type category="handle" parent="VkInstance"       objtypeenum="VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkDebugReportCallbackEXT</name>)</type>
         <type category="handle" parent="VkInstance"       objtypeenum="VK_OBJECT_TYPE_DEBUG_UTILS_MESSENGER_EXT"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkDebugUtilsMessengerEXT</name>)</type>
 
@@ -724,7 +724,6 @@
         <type name="VkOpacityMicromapSpecialIndexEXT" category="enum"/>
         <type name="VkDeviceFaultVendorBinaryHeaderVersionEXT" category="enum"/>
         <type name="VkMemoryDecompressionMethodFlagBitsNV" category="enum"/>
-        <type name="VkDirectDriverLoadingModeLUNARG" category="enum"/>
 
             <comment>WSI extensions</comment>
         <type name="VkColorSpaceKHR" category="enum"/>
@@ -896,10 +895,6 @@
     const <type>VkDeviceMemoryReportCallbackDataEXT</type>*  pCallbackData,
     <type>void</type>*                                       pUserData);</type>
 
-            <comment>The PFN_vkGetInstanceProcAddr type are used by the VK_LUNARG_direct_driver_loading extension</comment>
-        <type category="funcpointer" requires="VkInstance">typedef PFN_vkVoidFunction (VKAPI_PTR *<name>PFN_vkGetInstanceProcAddr</name>)(
-    <type>VkInstance</type> instance, const <type>char</type>* pName);</type>
-
             <comment>Struct types</comment>
         <type category="struct" name="VkBaseOutStructure">
             <member><type>VkStructureType</type> <name>sType</name></member>
@@ -1196,7 +1191,7 @@
             <member noautovalidity="true" len="queueFamilyIndexCount">const <type>uint32_t</type>*        <name>pQueueFamilyIndices</name><comment>Array of queue family indices to share across</comment></member>
             <member><type>VkImageLayout</type>          <name>initialLayout</name><comment>Initial image layout for all subresources</comment></member>
         </type>
-        <type category="struct" name="VkSubresourceLayout">
+        <type category="struct" name="VkSubresourceLayout" returnedonly="true">
             <member><type>VkDeviceSize</type>           <name>offset</name><comment>Specified in bytes</comment></member>
             <member><type>VkDeviceSize</type>           <name>size</name><comment>Specified in bytes</comment></member>
             <member><type>VkDeviceSize</type>           <name>rowPitch</name><comment>Specified in bytes</comment></member>
@@ -6275,8 +6270,8 @@
             <member values="VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PICTURE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*        <name>pNext</name></member>
             <member><type>StdVideoDecodeH265PictureInfo</type>*     <name>pStdPictureInfo</name></member>
-            <member><type>uint32_t</type>                           <name>sliceSegmentCount</name></member>
-            <member len="sliceSegmentCount">const <type>uint32_t</type>*   <name>pSliceSegmentOffsets</name></member>
+            <member><type>uint32_t</type>                           <name>sliceCount</name></member>
+            <member len="sliceCount">const <type>uint32_t</type>*   <name>pSliceOffsets</name></member>
         </type>
         <type category="struct" name="VkVideoDecodeH265DpbSlotInfoEXT" structextends="VkVideoReferenceSlotInfoKHR">
             <member values="VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_DPB_SLOT_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
@@ -6759,7 +6754,7 @@
             <member selection="VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER" optional="true">const <type>VkDescriptorAddressInfoEXT</type>*       <name>pStorageTexelBuffer</name></member>
             <member selection="VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER" optional="true">const <type>VkDescriptorAddressInfoEXT</type>*             <name>pUniformBuffer</name></member>
             <member selection="VK_DESCRIPTOR_TYPE_STORAGE_BUFFER" optional="true">const <type>VkDescriptorAddressInfoEXT</type>*             <name>pStorageBuffer</name></member>
-            <member selection="VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR,VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV"><type>VkDeviceAddress</type> <name>accelerationStructure</name></member>
+            <member selection="VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR,VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV"> <type>VkDeviceAddress</type> <name>accelerationStructure</name></member>
         </type>
         <type category="struct" name="VkDescriptorGetInfoEXT">
             <member values="VK_STRUCTURE_TYPE_DESCRIPTOR_GET_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
@@ -7665,24 +7660,6 @@
             <member optional="true" noautovalidity="true"><type>void</type>* <name>pNext</name></member>
             <member limittype="noauto"><type>VkRayTracingInvocationReorderModeNV</type>                                    <name>rayTracingInvocationReorderReorderingHint</name></member>
         </type>
-        <type category="struct" name="VkDirectDriverLoadingInfoLUNARG">
-            <member values="VK_STRUCTURE_TYPE_DIRECT_DRIVER_LOADING_INFO_LUNARG"><type>VkStructureType</type> <name>sType</name></member>
-            <member optional="true" noautovalidity="true"><type>void</type>*                                  <name>pNext</name></member>
-            <member><type>VkDirectDriverLoadingFlagsLUNARG</type>                                             <name>flags</name></member>
-            <member noautovalidity="true"><type>PFN_vkGetInstanceProcAddr</type>                              <name>pfnGetInstanceProcAddr</name></member>
-        </type>
-        <type category="struct" name="VkDirectDriverLoadingListLUNARG" structextends="VkInstanceCreateInfo">
-            <member values="VK_STRUCTURE_TYPE_DIRECT_DRIVER_LOADING_LIST_LUNARG"><type>VkStructureType</type> <name>sType</name></member>
-            <member optional="true" noautovalidity="true"><type>void</type>*                 <name>pNext</name></member>
-            <member><type>VkDirectDriverLoadingModeLUNARG</type>                             <name>mode</name></member>
-            <member><type>uint32_t</type>                                                    <name>driverCount</name></member>
-            <member len="driverCount">const <type>VkDirectDriverLoadingInfoLUNARG</type>*    <name>pDrivers</name></member>
-        </type>
-        <type category="struct" name="VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
-            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_VIEWPORTS_FEATURES_QCOM"><type>VkStructureType</type> <name>sType</name></member>
-            <member optional="true"><type>void</type>*            <name>pNext</name></member>
-            <member><type>VkBool32</type>                         <name>multiviewPerViewViewports</name></member>
-        </type>
     </types>
 
 
@@ -8265,10 +8242,6 @@
         <enum value="0"     name="VK_RAY_TRACING_INVOCATION_REORDER_MODE_NONE_NV"/>
         <enum value="1"     name="VK_RAY_TRACING_INVOCATION_REORDER_MODE_REORDER_NV"/>
     </enums>
-    <enums name="VkDirectDriverLoadingModeLUNARG" type="enum">
-        <enum value="0"     name="VK_DIRECT_DRIVER_LOADING_MODE_EXCLUSIVE_LUNARG"/>
-        <enum value="1"     name="VK_DIRECT_DRIVER_LOADING_MODE_INCLUSIVE_LUNARG"/>
-    </enums>
 
         <comment>Flags</comment>
     <enums name="VkQueueFlagBits" type="bitmask">
@@ -10641,14 +10614,14 @@
             <proto><type>void</type> <name>vkCmdEndConditionalRenderingEXT</name></proto>
             <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param>
         </command>
-        <command queues="graphics,compute,decode,encode,opticalflow" renderpass="outside" cmdbufferlevel="primary,secondary" tasks="action">
+        <command queues="graphics,compute,decode,encode" renderpass="outside" cmdbufferlevel="primary,secondary" tasks="action">
             <proto><type>void</type> <name>vkCmdResetQueryPool</name></proto>
             <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param>
             <param><type>VkQueryPool</type> <name>queryPool</name></param>
             <param><type>uint32_t</type> <name>firstQuery</name></param>
             <param><type>uint32_t</type> <name>queryCount</name></param>
         </command>
-        <command queues="transfer,graphics,compute,decode,encode,opticalflow" renderpass="both" videocoding="both" cmdbufferlevel="primary,secondary" tasks="action">
+        <command queues="transfer,graphics,compute,decode,encode" renderpass="both" videocoding="both" cmdbufferlevel="primary,secondary" tasks="action">
             <proto><type>void</type> <name>vkCmdWriteTimestamp</name></proto>
             <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param>
             <param><type>VkPipelineStageFlagBits</type> <name>pipelineStage</name></param>
@@ -17397,7 +17370,7 @@
         </extension>
         <extension name="VK_EXT_video_decode_h265" number="188" type="device" requires="VK_KHR_video_decode_queue" author="KHR" contact="peter.fang@amd.com" provisional="true" platform="provisional" supported="vulkan">
             <require>
-                <enum value="6"                                         name="VK_EXT_VIDEO_DECODE_H265_SPEC_VERSION"/>
+                <enum value="5"                                         name="VK_EXT_VIDEO_DECODE_H265_SPEC_VERSION"/>
                 <enum value="&quot;VK_EXT_video_decode_h265&quot;"      name="VK_EXT_VIDEO_DECODE_H265_EXTENSION_NAME"/>
                 <enum offset="0" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_CAPABILITIES_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
                 <enum offset="1" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_CREATE_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
@@ -20471,17 +20444,10 @@
                 <type name="VkSubpassMergeStatusEXT"/>
             </require>
         </extension>
-        <extension name="VK_LUNARG_direct_driver_loading" number="460" type="instance" author="LUNARG" contact="Charles Giessen @charles-lunarg" supported="vulkan">
+        <extension name="VK_EXT_extension_460" number="460" author="EXT" contact="Charles Giessen @charles-lunarg" supported="disabled">
             <require>
-                <enum value="1"                                           name="VK_LUNARG_DIRECT_DRIVER_LOADING_SPEC_VERSION"/>
-                <enum value="&quot;VK_LUNARG_direct_driver_loading&quot;" name="VK_LUNARG_DIRECT_DRIVER_LOADING_EXTENSION_NAME"/>
-                <enum offset="0" extends="VkStructureType"                name="VK_STRUCTURE_TYPE_DIRECT_DRIVER_LOADING_INFO_LUNARG"/>
-                <enum offset="1" extends="VkStructureType"                name="VK_STRUCTURE_TYPE_DIRECT_DRIVER_LOADING_LIST_LUNARG"/>
-                <type name="VkDirectDriverLoadingFlagsLUNARG" comment="Will add VkDirectDriverLoadingFlagBitsLUNARG when bits are defined in the future"/>
-                <type name="VkDirectDriverLoadingModeLUNARG"/>
-                <type name="VkDirectDriverLoadingInfoLUNARG"/>
-                <type name="VkDirectDriverLoadingListLUNARG"/>
-                <type name="PFN_vkGetInstanceProcAddr"/>
+                <enum value="0"                                         name="VK_EXT_EXTENSION_460_SPEC_VERSION"/>
+                <enum value="&quot;VK_EXT_extension_460&quot;"          name="VK_EXT_EXTENSION_460_EXTENSION_NAME"/>
             </require>
         </extension>
         <extension name="VK_EXT_extension_461" number="461" author="EXT" contact="Kevin Petit @kevinpetit" supported="disabled">
@@ -20740,12 +20706,10 @@
                 <enum value="&quot;VK_EXT_extension_488&quot;"          name="VK_EXT_EXTENSION_488_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_multiview_per_view_viewports" number="489" type="device" author="QCOM" contact="Jeff Leger @jackohound" supported="vulkan">
+        <extension name="VK_QCOM_extension_489" number="489" author="QCOM" contact="Jeff Leger @jackohound" supported="disabled">
             <require>
-                <enum value="1"                                                name="VK_QCOM_MULTIVIEW_PER_VIEW_VIEWPORTS_SPEC_VERSION"/>
-                <enum value="&quot;VK_QCOM_multiview_per_view_viewports&quot;" name="VK_QCOM_MULTIVIEW_PER_VIEW_VIEWPORTS_EXTENSION_NAME"/>
-                <enum offset="0" extends="VkStructureType"                     name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_VIEWPORTS_FEATURES_QCOM"/>
-                <type name="VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM"/>
+                <enum value="0"                                         name="VK_QCOM_EXTENSION_489_SPEC_VERSION"/>
+                <enum value="&quot;VK_QCOM_extension_489&quot;"          name="VK_QCOM_EXTENSION_489_EXTENSION_NAME"/>
             </require>
         </extension>
         <extension name="VK_NV_extension_490" number="490" author="NV" contact="Daniel Koch @dgkoch" supported="disabled">
@@ -20855,12 +20819,6 @@
                 <enum value="&quot;VK_NV_extension_504&quot;"               name="VK_NV_EXTENSION_504_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_EXT_extension_505" number="505" author="EXT" contact="Jamie Madill @jmadill" type="device" supported="disabled">
-            <require>
-                <enum value="0"                                             name="VK_EXT_EXTENSION_505_SPEC_VERSION"/>
-                <enum value="&quot;VK_EXT_extension_505&quot;"              name="VK_EXT_EXTENSION_505_EXTENSION_NAME"/>
-            </require>
-        </extension>
     </extensions>
     <formats>
         <format name="VK_FORMAT_R4G4_UNORM_PACK8" class="8-bit" blockSize="1" texelsPerBlock="1" packed="8">