build: Update to header 1.4.329
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cad63bd..9f785d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@
 # The VERSION field is generated with the "--generated-version" flag in the generate_source.py script
 #
 # If working with unreleased extensions, make sure the header and validation version are all on the same header version
-project(VVL VERSION 1.4.328 LANGUAGES CXX)
+project(VVL VERSION 1.4.329 LANGUAGES CXX)
 
 # This variable enables downstream users to customize the target API
 # variant (e.g. Vulkan SC)
diff --git a/layers/VkLayer_khronos_validation.json.in b/layers/VkLayer_khronos_validation.json.in
index cce19a2..4b9b927 100644
--- a/layers/VkLayer_khronos_validation.json.in
+++ b/layers/VkLayer_khronos_validation.json.in
@@ -5,7 +5,7 @@
         "prefix": "vvl",
         "type": "GLOBAL",
         "library_path": "@JSON_LIBRARY_PATH@",
-        "api_version": "1.4.328",
+        "api_version": "1.4.329",
         "implementation_version": "1",
         "description": "Khronos Validation Layer",
         "introduction": "The main, comprehensive Khronos validation layer.\n\nVulkan is an Explicit API, enabling direct control over how GPUs actually work. By design, minimal error checking is done inside a Vulkan driver. Applications have full control and responsibility for correct operation. Any errors in how Vulkan is used can result in a crash. \n\nThe Khronos Validation Layer can be enabled to assist development by enabling developers to verify their applications correctly use the Vulkan API.",
diff --git a/layers/vulkan/generated/command_validation.cpp b/layers/vulkan/generated/command_validation.cpp
index d193ca5..b301a54 100644
--- a/layers/vulkan/generated/command_validation.cpp
+++ b/layers/vulkan/generated/command_validation.cpp
@@ -183,7 +183,7 @@
 {Func::vkCmdCopyBuffer, {
     "VUID-vkCmdCopyBuffer-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdCopyBuffer-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdCopyBuffer-commandBuffer-cmdpool",
     CommandScope::Outside, "VUID-vkCmdCopyBuffer-renderpass",
     CommandScope::Outside, "VUID-vkCmdCopyBuffer-videocoding",
     false, true, false,
@@ -191,7 +191,7 @@
 {Func::vkCmdCopyImage, {
     "VUID-vkCmdCopyImage-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdCopyImage-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdCopyImage-commandBuffer-cmdpool",
     CommandScope::Outside, "VUID-vkCmdCopyImage-renderpass",
     CommandScope::Outside, "VUID-vkCmdCopyImage-videocoding",
     false, true, false,
@@ -207,7 +207,7 @@
 {Func::vkCmdCopyBufferToImage, {
     "VUID-vkCmdCopyBufferToImage-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdCopyBufferToImage-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdCopyBufferToImage-commandBuffer-cmdpool",
     CommandScope::Outside, "VUID-vkCmdCopyBufferToImage-renderpass",
     CommandScope::Outside, "VUID-vkCmdCopyBufferToImage-videocoding",
     false, true, false,
@@ -215,7 +215,7 @@
 {Func::vkCmdCopyImageToBuffer, {
     "VUID-vkCmdCopyImageToBuffer-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdCopyImageToBuffer-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdCopyImageToBuffer-commandBuffer-cmdpool",
     CommandScope::Outside, "VUID-vkCmdCopyImageToBuffer-renderpass",
     CommandScope::Outside, "VUID-vkCmdCopyImageToBuffer-videocoding",
     false, true, false,
@@ -223,7 +223,7 @@
 {Func::vkCmdUpdateBuffer, {
     "VUID-vkCmdUpdateBuffer-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdUpdateBuffer-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdUpdateBuffer-commandBuffer-cmdpool",
     CommandScope::Outside, "VUID-vkCmdUpdateBuffer-renderpass",
     CommandScope::Outside, "VUID-vkCmdUpdateBuffer-videocoding",
     false, true, false,
@@ -231,7 +231,7 @@
 {Func::vkCmdFillBuffer, {
     "VUID-vkCmdFillBuffer-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdFillBuffer-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdFillBuffer-commandBuffer-cmdpool",
     CommandScope::Outside, "VUID-vkCmdFillBuffer-renderpass",
     CommandScope::Outside, "VUID-vkCmdFillBuffer-videocoding",
     false, true, false,
@@ -295,7 +295,7 @@
 {Func::vkCmdPipelineBarrier, {
     "VUID-vkCmdPipelineBarrier-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR, "VUID-vkCmdPipelineBarrier-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR, "VUID-vkCmdPipelineBarrier-commandBuffer-cmdpool",
     CommandScope::Both, "kVUIDUndefined",
     CommandScope::Both, "kVUIDUndefined",
     false, false, true,
@@ -327,7 +327,7 @@
 {Func::vkCmdWriteTimestamp, {
     "VUID-vkCmdWriteTimestamp-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR | VK_QUEUE_OPTICAL_FLOW_BIT_NV, "VUID-vkCmdWriteTimestamp-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR | VK_QUEUE_OPTICAL_FLOW_BIT_NV, "VUID-vkCmdWriteTimestamp-commandBuffer-cmdpool",
     CommandScope::Both, "kVUIDUndefined",
     CommandScope::Both, "kVUIDUndefined",
     false, true, false,
@@ -375,7 +375,7 @@
 {Func::vkCmdExecuteCommands, {
     "VUID-vkCmdExecuteCommands-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdExecuteCommands-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdExecuteCommands-commandBuffer-cmdpool",
     CommandScope::Both, "kVUIDUndefined",
     CommandScope::Outside, "VUID-vkCmdExecuteCommands-videocoding",
     false, false, false,
@@ -463,7 +463,7 @@
 {Func::vkCmdPipelineBarrier2, {
     "VUID-vkCmdPipelineBarrier2-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR, "VUID-vkCmdPipelineBarrier2-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR, "VUID-vkCmdPipelineBarrier2-commandBuffer-cmdpool",
     CommandScope::Both, "kVUIDUndefined",
     CommandScope::Both, "kVUIDUndefined",
     false, false, true,
@@ -471,7 +471,7 @@
 {Func::vkCmdWriteTimestamp2, {
     "VUID-vkCmdWriteTimestamp2-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR, "VUID-vkCmdWriteTimestamp2-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR, "VUID-vkCmdWriteTimestamp2-commandBuffer-cmdpool",
     CommandScope::Both, "kVUIDUndefined",
     CommandScope::Both, "kVUIDUndefined",
     false, true, false,
@@ -479,7 +479,7 @@
 {Func::vkCmdCopyBuffer2, {
     "VUID-vkCmdCopyBuffer2-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdCopyBuffer2-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdCopyBuffer2-commandBuffer-cmdpool",
     CommandScope::Outside, "VUID-vkCmdCopyBuffer2-renderpass",
     CommandScope::Outside, "VUID-vkCmdCopyBuffer2-videocoding",
     false, true, false,
@@ -487,7 +487,7 @@
 {Func::vkCmdCopyImage2, {
     "VUID-vkCmdCopyImage2-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdCopyImage2-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdCopyImage2-commandBuffer-cmdpool",
     CommandScope::Outside, "VUID-vkCmdCopyImage2-renderpass",
     CommandScope::Outside, "VUID-vkCmdCopyImage2-videocoding",
     false, true, false,
@@ -495,7 +495,7 @@
 {Func::vkCmdCopyBufferToImage2, {
     "VUID-vkCmdCopyBufferToImage2-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdCopyBufferToImage2-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdCopyBufferToImage2-commandBuffer-cmdpool",
     CommandScope::Outside, "VUID-vkCmdCopyBufferToImage2-renderpass",
     CommandScope::Outside, "VUID-vkCmdCopyBufferToImage2-videocoding",
     false, true, false,
@@ -503,7 +503,7 @@
 {Func::vkCmdCopyImageToBuffer2, {
     "VUID-vkCmdCopyImageToBuffer2-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdCopyImageToBuffer2-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdCopyImageToBuffer2-commandBuffer-cmdpool",
     CommandScope::Outside, "VUID-vkCmdCopyImageToBuffer2-renderpass",
     CommandScope::Outside, "VUID-vkCmdCopyImageToBuffer2-videocoding",
     false, true, false,
@@ -919,7 +919,7 @@
 {Func::vkCmdPipelineBarrier2KHR, {
     "VUID-vkCmdPipelineBarrier2-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR, "VUID-vkCmdPipelineBarrier2-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR, "VUID-vkCmdPipelineBarrier2-commandBuffer-cmdpool",
     CommandScope::Both, "kVUIDUndefined",
     CommandScope::Both, "kVUIDUndefined",
     false, false, true,
@@ -927,7 +927,7 @@
 {Func::vkCmdWriteTimestamp2KHR, {
     "VUID-vkCmdWriteTimestamp2-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR, "VUID-vkCmdWriteTimestamp2-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR, "VUID-vkCmdWriteTimestamp2-commandBuffer-cmdpool",
     CommandScope::Both, "kVUIDUndefined",
     CommandScope::Both, "kVUIDUndefined",
     false, true, false,
@@ -935,7 +935,7 @@
 {Func::vkCmdCopyBuffer2KHR, {
     "VUID-vkCmdCopyBuffer2-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdCopyBuffer2-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdCopyBuffer2-commandBuffer-cmdpool",
     CommandScope::Outside, "VUID-vkCmdCopyBuffer2-renderpass",
     CommandScope::Outside, "VUID-vkCmdCopyBuffer2-videocoding",
     false, true, false,
@@ -943,7 +943,7 @@
 {Func::vkCmdCopyImage2KHR, {
     "VUID-vkCmdCopyImage2-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdCopyImage2-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdCopyImage2-commandBuffer-cmdpool",
     CommandScope::Outside, "VUID-vkCmdCopyImage2-renderpass",
     CommandScope::Outside, "VUID-vkCmdCopyImage2-videocoding",
     false, true, false,
@@ -951,7 +951,7 @@
 {Func::vkCmdCopyBufferToImage2KHR, {
     "VUID-vkCmdCopyBufferToImage2-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdCopyBufferToImage2-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdCopyBufferToImage2-commandBuffer-cmdpool",
     CommandScope::Outside, "VUID-vkCmdCopyBufferToImage2-renderpass",
     CommandScope::Outside, "VUID-vkCmdCopyBufferToImage2-videocoding",
     false, true, false,
@@ -959,7 +959,7 @@
 {Func::vkCmdCopyImageToBuffer2KHR, {
     "VUID-vkCmdCopyImageToBuffer2-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdCopyImageToBuffer2-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdCopyImageToBuffer2-commandBuffer-cmdpool",
     CommandScope::Outside, "VUID-vkCmdCopyImageToBuffer2-renderpass",
     CommandScope::Outside, "VUID-vkCmdCopyImageToBuffer2-videocoding",
     false, true, false,
@@ -1055,7 +1055,7 @@
 {Func::vkCmdCopyMemoryIndirectKHR, {
     "VUID-vkCmdCopyMemoryIndirectKHR-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdCopyMemoryIndirectKHR-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdCopyMemoryIndirectKHR-commandBuffer-cmdpool",
     CommandScope::Outside, "VUID-vkCmdCopyMemoryIndirectKHR-renderpass",
     CommandScope::Outside, "VUID-vkCmdCopyMemoryIndirectKHR-videocoding",
     false, true, false,
@@ -1063,7 +1063,7 @@
 {Func::vkCmdCopyMemoryToImageIndirectKHR, {
     "VUID-vkCmdCopyMemoryToImageIndirectKHR-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdCopyMemoryToImageIndirectKHR-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdCopyMemoryToImageIndirectKHR-commandBuffer-cmdpool",
     CommandScope::Outside, "VUID-vkCmdCopyMemoryToImageIndirectKHR-renderpass",
     CommandScope::Outside, "VUID-vkCmdCopyMemoryToImageIndirectKHR-videocoding",
     false, true, false,
@@ -1071,7 +1071,7 @@
 {Func::vkCmdDebugMarkerBeginEXT, {
     "VUID-vkCmdDebugMarkerBeginEXT-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR | VK_QUEUE_OPTICAL_FLOW_BIT_NV, "VUID-vkCmdDebugMarkerBeginEXT-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR | VK_QUEUE_OPTICAL_FLOW_BIT_NV, "VUID-vkCmdDebugMarkerBeginEXT-commandBuffer-cmdpool",
     CommandScope::Both, "kVUIDUndefined",
     CommandScope::Both, "kVUIDUndefined",
     false, true, false,
@@ -1079,7 +1079,7 @@
 {Func::vkCmdDebugMarkerEndEXT, {
     "VUID-vkCmdDebugMarkerEndEXT-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR | VK_QUEUE_OPTICAL_FLOW_BIT_NV, "VUID-vkCmdDebugMarkerEndEXT-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR | VK_QUEUE_OPTICAL_FLOW_BIT_NV, "VUID-vkCmdDebugMarkerEndEXT-commandBuffer-cmdpool",
     CommandScope::Both, "kVUIDUndefined",
     CommandScope::Both, "kVUIDUndefined",
     false, true, false,
@@ -1087,7 +1087,7 @@
 {Func::vkCmdDebugMarkerInsertEXT, {
     "VUID-vkCmdDebugMarkerInsertEXT-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR | VK_QUEUE_OPTICAL_FLOW_BIT_NV, "VUID-vkCmdDebugMarkerInsertEXT-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR | VK_QUEUE_OPTICAL_FLOW_BIT_NV, "VUID-vkCmdDebugMarkerInsertEXT-commandBuffer-cmdpool",
     CommandScope::Both, "kVUIDUndefined",
     CommandScope::Both, "kVUIDUndefined",
     false, true, false,
@@ -1215,7 +1215,7 @@
 {Func::vkCmdBeginDebugUtilsLabelEXT, {
     "VUID-vkCmdBeginDebugUtilsLabelEXT-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR | VK_QUEUE_OPTICAL_FLOW_BIT_NV, "VUID-vkCmdBeginDebugUtilsLabelEXT-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR | VK_QUEUE_OPTICAL_FLOW_BIT_NV, "VUID-vkCmdBeginDebugUtilsLabelEXT-commandBuffer-cmdpool",
     CommandScope::Both, "kVUIDUndefined",
     CommandScope::Both, "kVUIDUndefined",
     true, true, false,
@@ -1223,7 +1223,7 @@
 {Func::vkCmdEndDebugUtilsLabelEXT, {
     "VUID-vkCmdEndDebugUtilsLabelEXT-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR | VK_QUEUE_OPTICAL_FLOW_BIT_NV, "VUID-vkCmdEndDebugUtilsLabelEXT-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR | VK_QUEUE_OPTICAL_FLOW_BIT_NV, "VUID-vkCmdEndDebugUtilsLabelEXT-commandBuffer-cmdpool",
     CommandScope::Both, "kVUIDUndefined",
     CommandScope::Both, "kVUIDUndefined",
     true, true, false,
@@ -1231,7 +1231,7 @@
 {Func::vkCmdInsertDebugUtilsLabelEXT, {
     "VUID-vkCmdInsertDebugUtilsLabelEXT-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR | VK_QUEUE_OPTICAL_FLOW_BIT_NV, "VUID-vkCmdInsertDebugUtilsLabelEXT-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR | VK_QUEUE_OPTICAL_FLOW_BIT_NV, "VUID-vkCmdInsertDebugUtilsLabelEXT-commandBuffer-cmdpool",
     CommandScope::Both, "kVUIDUndefined",
     CommandScope::Both, "kVUIDUndefined",
     false, true, false,
@@ -1335,7 +1335,7 @@
 {Func::vkCmdWriteBufferMarkerAMD, {
     "VUID-vkCmdWriteBufferMarkerAMD-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdWriteBufferMarkerAMD-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdWriteBufferMarkerAMD-commandBuffer-cmdpool",
     CommandScope::Both, "kVUIDUndefined",
     CommandScope::Outside, "VUID-vkCmdWriteBufferMarkerAMD-videocoding",
     false, true, false,
@@ -1343,7 +1343,7 @@
 {Func::vkCmdWriteBufferMarker2AMD, {
     "VUID-vkCmdWriteBufferMarker2AMD-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdWriteBufferMarker2AMD-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdWriteBufferMarker2AMD-commandBuffer-cmdpool",
     CommandScope::Both, "kVUIDUndefined",
     CommandScope::Outside, "VUID-vkCmdWriteBufferMarker2AMD-videocoding",
     false, true, false,
@@ -1767,7 +1767,7 @@
 {Func::vkCmdCopyMemoryIndirectNV, {
     "VUID-vkCmdCopyMemoryIndirectNV-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdCopyMemoryIndirectNV-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdCopyMemoryIndirectNV-commandBuffer-cmdpool",
     CommandScope::Outside, "VUID-vkCmdCopyMemoryIndirectNV-renderpass",
     CommandScope::Outside, "VUID-vkCmdCopyMemoryIndirectNV-videocoding",
     false, true, false,
@@ -1775,7 +1775,7 @@
 {Func::vkCmdCopyMemoryToImageIndirectNV, {
     "VUID-vkCmdCopyMemoryToImageIndirectNV-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdCopyMemoryToImageIndirectNV-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdCopyMemoryToImageIndirectNV-commandBuffer-cmdpool",
     CommandScope::Outside, "VUID-vkCmdCopyMemoryToImageIndirectNV-renderpass",
     CommandScope::Outside, "VUID-vkCmdCopyMemoryToImageIndirectNV-videocoding",
     false, true, false,
@@ -1799,7 +1799,7 @@
 {Func::vkCmdUpdatePipelineIndirectBufferNV, {
     "VUID-vkCmdUpdatePipelineIndirectBufferNV-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdUpdatePipelineIndirectBufferNV-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdUpdatePipelineIndirectBufferNV-commandBuffer-cmdpool",
     CommandScope::Outside, "VUID-vkCmdUpdatePipelineIndirectBufferNV-renderpass",
     CommandScope::Outside, "VUID-vkCmdUpdatePipelineIndirectBufferNV-videocoding",
     false, true, false,
@@ -2055,7 +2055,7 @@
 {Func::vkCmdCopyTensorARM, {
     "VUID-vkCmdCopyTensorARM-commandBuffer-recording",
     nullptr,
-    VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT, "VUID-vkCmdCopyTensorARM-commandBuffer-cmdpool",
+    VK_QUEUE_TRANSFER_BIT | VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, "VUID-vkCmdCopyTensorARM-commandBuffer-cmdpool",
     CommandScope::Outside, "VUID-vkCmdCopyTensorARM-renderpass",
     CommandScope::Outside, "VUID-vkCmdCopyTensorARM-videocoding",
     false, true, false,
diff --git a/layers/vulkan/generated/device_features.cpp b/layers/vulkan/generated/device_features.cpp
index 833c793..445e9a8 100644
--- a/layers/vulkan/generated/device_features.cpp
+++ b/layers/vulkan/generated/device_features.cpp
@@ -784,6 +784,14 @@
                 features->maintenance8 |= enabled->maintenance8 == VK_TRUE;
                 break;
             }
+            case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FMA_FEATURES_KHR: {
+                const VkPhysicalDeviceShaderFmaFeaturesKHR *enabled =
+                    reinterpret_cast<const VkPhysicalDeviceShaderFmaFeaturesKHR *>(pNext);
+                features->shaderFmaFloat16 |= enabled->shaderFmaFloat16 == VK_TRUE;
+                features->shaderFmaFloat32 |= enabled->shaderFmaFloat32 == VK_TRUE;
+                features->shaderFmaFloat64 |= enabled->shaderFmaFloat64 == VK_TRUE;
+                break;
+            }
             case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_9_FEATURES_KHR: {
                 const VkPhysicalDeviceMaintenance9FeaturesKHR *enabled =
                     reinterpret_cast<const VkPhysicalDeviceMaintenance9FeaturesKHR *>(pNext);
diff --git a/layers/vulkan/generated/device_features.h b/layers/vulkan/generated/device_features.h
index 8572ad2..d830ba5 100644
--- a/layers/vulkan/generated/device_features.h
+++ b/layers/vulkan/generated/device_features.h
@@ -856,6 +856,12 @@
     bool shaderFloat8CooperativeMatrix;
     // VkPhysicalDeviceShaderFloatControls2Features, VkPhysicalDeviceVulkan14Features
     bool shaderFloatControls2;
+    // VkPhysicalDeviceShaderFmaFeaturesKHR
+    bool shaderFmaFloat16;
+    // VkPhysicalDeviceShaderFmaFeaturesKHR
+    bool shaderFmaFloat32;
+    // VkPhysicalDeviceShaderFmaFeaturesKHR
+    bool shaderFmaFloat64;
     // VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT
     bool shaderImageInt64Atomics;
     // VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT
diff --git a/layers/vulkan/generated/enum_flag_bits.h b/layers/vulkan/generated/enum_flag_bits.h
index 4da69c2..e7ee6b4 100644
--- a/layers/vulkan/generated/enum_flag_bits.h
+++ b/layers/vulkan/generated/enum_flag_bits.h
@@ -24,7 +24,7 @@
 #include <array>
 #include "vulkan/vulkan.h"
 // clang-format off
-const uint32_t GeneratedVulkanHeaderVersion = 328;
+const uint32_t GeneratedVulkanHeaderVersion = 329;
 const VkAccessFlags AllVkAccessFlagBits = VK_ACCESS_INDIRECT_COMMAND_READ_BIT|VK_ACCESS_INDEX_READ_BIT|VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT|VK_ACCESS_UNIFORM_READ_BIT|VK_ACCESS_INPUT_ATTACHMENT_READ_BIT|VK_ACCESS_SHADER_READ_BIT|VK_ACCESS_SHADER_WRITE_BIT|VK_ACCESS_COLOR_ATTACHMENT_READ_BIT|VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT|VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT|VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT|VK_ACCESS_TRANSFER_READ_BIT|VK_ACCESS_TRANSFER_WRITE_BIT|VK_ACCESS_HOST_READ_BIT|VK_ACCESS_HOST_WRITE_BIT|VK_ACCESS_MEMORY_READ_BIT|VK_ACCESS_MEMORY_WRITE_BIT|VK_ACCESS_NONE|VK_ACCESS_TRANSFORM_FEEDBACK_WRITE_BIT_EXT|VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT|VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT|VK_ACCESS_CONDITIONAL_RENDERING_READ_BIT_EXT|VK_ACCESS_COLOR_ATTACHMENT_READ_NONCOHERENT_BIT_EXT|VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR|VK_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT_KHR|VK_ACCESS_FRAGMENT_DENSITY_MAP_READ_BIT_EXT|VK_ACCESS_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR|VK_ACCESS_COMMAND_PREPROCESS_READ_BIT_EXT|VK_ACCESS_COMMAND_PREPROCESS_WRITE_BIT_EXT;
 const VkImageAspectFlags AllVkImageAspectFlagBits = VK_IMAGE_ASPECT_COLOR_BIT|VK_IMAGE_ASPECT_DEPTH_BIT|VK_IMAGE_ASPECT_STENCIL_BIT|VK_IMAGE_ASPECT_METADATA_BIT|VK_IMAGE_ASPECT_PLANE_0_BIT|VK_IMAGE_ASPECT_PLANE_1_BIT|VK_IMAGE_ASPECT_PLANE_2_BIT|VK_IMAGE_ASPECT_NONE|VK_IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT|VK_IMAGE_ASPECT_MEMORY_PLANE_1_BIT_EXT|VK_IMAGE_ASPECT_MEMORY_PLANE_2_BIT_EXT|VK_IMAGE_ASPECT_MEMORY_PLANE_3_BIT_EXT;
 const VkInstanceCreateFlags AllVkInstanceCreateFlagBits = VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR;
diff --git a/layers/vulkan/generated/error_location_helper.cpp b/layers/vulkan/generated/error_location_helper.cpp
index 902135a..60e7411 100644
--- a/layers/vulkan/generated/error_location_helper.cpp
+++ b/layers/vulkan/generated/error_location_helper.cpp
@@ -1611,6 +1611,7 @@
     {"VkPhysicalDeviceShaderFloat16Int8Features", 42},
     {"VkPhysicalDeviceShaderFloat8FeaturesEXT", 40},
     {"VkPhysicalDeviceShaderFloatControls2Features", 45},
+    {"VkPhysicalDeviceShaderFmaFeaturesKHR", 37},
     {"VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT", 50},
     {"VkPhysicalDeviceShaderImageFootprintFeaturesNV", 47},
     {"VkPhysicalDeviceShaderIntegerDotProductFeatures", 48},
@@ -4628,6 +4629,9 @@
     {"shaderFloat8", 13},
     {"shaderFloat8CooperativeMatrix", 30},
     {"shaderFloatControls2", 21},
+    {"shaderFmaFloat16", 17},
+    {"shaderFmaFloat32", 17},
+    {"shaderFmaFloat64", 17},
     {"shaderGroupBaseAlignment", 25},
     {"shaderGroupHandleAlignment", 27},
     {"shaderGroupHandleCaptureReplaySize", 35},
@@ -5787,6 +5791,7 @@
     {"VK_KHR_shader_float16_int8", 27},
     {"VK_KHR_shader_float_controls", 29},
     {"VK_KHR_shader_float_controls2", 30},
+    {"VK_KHR_shader_fma", 18},
     {"VK_KHR_shader_integer_dot_product", 34},
     {"VK_KHR_shader_maximal_reconvergence", 36},
     {"VK_KHR_shader_non_semantic_info", 32},
@@ -7536,6 +7541,8 @@
        return Struct::VkMemoryBarrierAccessFlags3KHR;
     case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_8_FEATURES_KHR:
        return Struct::VkPhysicalDeviceMaintenance8FeaturesKHR;
+    case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FMA_FEATURES_KHR:
+       return Struct::VkPhysicalDeviceShaderFmaFeaturesKHR;
     case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_9_FEATURES_KHR:
        return Struct::VkPhysicalDeviceMaintenance9FeaturesKHR;
     case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_9_PROPERTIES_KHR:
diff --git a/layers/vulkan/generated/error_location_helper.h b/layers/vulkan/generated/error_location_helper.h
index ec06a14..fa02a2c 100644
--- a/layers/vulkan/generated/error_location_helper.h
+++ b/layers/vulkan/generated/error_location_helper.h
@@ -1605,6 +1605,7 @@
     VkPhysicalDeviceShaderFloat16Int8Features,
     VkPhysicalDeviceShaderFloat8FeaturesEXT,
     VkPhysicalDeviceShaderFloatControls2Features,
+    VkPhysicalDeviceShaderFmaFeaturesKHR,
     VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT,
     VkPhysicalDeviceShaderImageFootprintFeaturesNV,
     VkPhysicalDeviceShaderIntegerDotProductFeatures,
@@ -4619,6 +4620,9 @@
     shaderFloat8,
     shaderFloat8CooperativeMatrix,
     shaderFloatControls2,
+    shaderFmaFloat16,
+    shaderFmaFloat32,
+    shaderFmaFloat64,
     shaderGroupBaseAlignment,
     shaderGroupHandleAlignment,
     shaderGroupHandleCaptureReplaySize,
@@ -5769,6 +5773,7 @@
     _VK_KHR_shader_float16_int8,
     _VK_KHR_shader_float_controls,
     _VK_KHR_shader_float_controls2,
+    _VK_KHR_shader_fma,
     _VK_KHR_shader_integer_dot_product,
     _VK_KHR_shader_maximal_reconvergence,
     _VK_KHR_shader_non_semantic_info,
diff --git a/layers/vulkan/generated/feature_not_present.cpp b/layers/vulkan/generated/feature_not_present.cpp
index 50a3997..e66f2d5 100644
--- a/layers/vulkan/generated/feature_not_present.cpp
+++ b/layers/vulkan/generated/feature_not_present.cpp
@@ -2837,6 +2837,23 @@
                 }
                 break;
             }
+            case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FMA_FEATURES_KHR: {
+                VkPhysicalDeviceShaderFmaFeaturesKHR supported = vku::InitStructHelper();
+                features_2.pNext = &supported;
+                DispatchGetPhysicalDeviceFeatures2(gpu, &features_2);
+                const VkPhysicalDeviceShaderFmaFeaturesKHR *enabling =
+                    reinterpret_cast<const VkPhysicalDeviceShaderFmaFeaturesKHR *>(current);
+                if (enabling->shaderFmaFloat16 && !supported.shaderFmaFloat16) {
+                    ss << "VkPhysicalDeviceShaderFmaFeaturesKHR::shaderFmaFloat16 is not supported\n";
+                }
+                if (enabling->shaderFmaFloat32 && !supported.shaderFmaFloat32) {
+                    ss << "VkPhysicalDeviceShaderFmaFeaturesKHR::shaderFmaFloat32 is not supported\n";
+                }
+                if (enabling->shaderFmaFloat64 && !supported.shaderFmaFloat64) {
+                    ss << "VkPhysicalDeviceShaderFmaFeaturesKHR::shaderFmaFloat64 is not supported\n";
+                }
+                break;
+            }
             case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT: {
                 VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT supported = vku::InitStructHelper();
                 features_2.pNext = &supported;
diff --git a/layers/vulkan/generated/feature_requirements_helper.cpp b/layers/vulkan/generated/feature_requirements_helper.cpp
index 83611bf..39cca9e 100644
--- a/layers/vulkan/generated/feature_requirements_helper.cpp
+++ b/layers/vulkan/generated/feature_requirements_helper.cpp
@@ -6495,6 +6495,51 @@
                 }
                 return {&vk_struct->shaderFloatControls2, "VkPhysicalDeviceShaderFloatControls2Features::shaderFloatControls2"};
             }
+        case Feature::shaderFmaFloat16: {
+            auto vk_struct = const_cast<VkPhysicalDeviceShaderFmaFeaturesKHR *>(
+                vku::FindStructInPNextChain<VkPhysicalDeviceShaderFmaFeaturesKHR>(*inout_pnext_chain));
+            if (!vk_struct) {
+                vk_struct = new VkPhysicalDeviceShaderFmaFeaturesKHR;
+                *vk_struct = vku::InitStructHelper();
+                if (*inout_pnext_chain) {
+                    vvl::PnextChainAdd(*inout_pnext_chain, vk_struct);
+                } else {
+                    *inout_pnext_chain = vk_struct;
+                }
+            }
+            return {&vk_struct->shaderFmaFloat16, "VkPhysicalDeviceShaderFmaFeaturesKHR::shaderFmaFloat16"};
+        }
+
+        case Feature::shaderFmaFloat32: {
+            auto vk_struct = const_cast<VkPhysicalDeviceShaderFmaFeaturesKHR *>(
+                vku::FindStructInPNextChain<VkPhysicalDeviceShaderFmaFeaturesKHR>(*inout_pnext_chain));
+            if (!vk_struct) {
+                vk_struct = new VkPhysicalDeviceShaderFmaFeaturesKHR;
+                *vk_struct = vku::InitStructHelper();
+                if (*inout_pnext_chain) {
+                    vvl::PnextChainAdd(*inout_pnext_chain, vk_struct);
+                } else {
+                    *inout_pnext_chain = vk_struct;
+                }
+            }
+            return {&vk_struct->shaderFmaFloat32, "VkPhysicalDeviceShaderFmaFeaturesKHR::shaderFmaFloat32"};
+        }
+
+        case Feature::shaderFmaFloat64: {
+            auto vk_struct = const_cast<VkPhysicalDeviceShaderFmaFeaturesKHR *>(
+                vku::FindStructInPNextChain<VkPhysicalDeviceShaderFmaFeaturesKHR>(*inout_pnext_chain));
+            if (!vk_struct) {
+                vk_struct = new VkPhysicalDeviceShaderFmaFeaturesKHR;
+                *vk_struct = vku::InitStructHelper();
+                if (*inout_pnext_chain) {
+                    vvl::PnextChainAdd(*inout_pnext_chain, vk_struct);
+                } else {
+                    *inout_pnext_chain = vk_struct;
+                }
+            }
+            return {&vk_struct->shaderFmaFloat64, "VkPhysicalDeviceShaderFmaFeaturesKHR::shaderFmaFloat64"};
+        }
+
         case Feature::shaderImageInt64Atomics: {
             auto vk_struct = const_cast<VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT *>(
                 vku::FindStructInPNextChain<VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT>(*inout_pnext_chain));
diff --git a/layers/vulkan/generated/feature_requirements_helper.h b/layers/vulkan/generated/feature_requirements_helper.h
index decf718..3d7e293 100644
--- a/layers/vulkan/generated/feature_requirements_helper.h
+++ b/layers/vulkan/generated/feature_requirements_helper.h
@@ -846,6 +846,12 @@
     shaderFloat8CooperativeMatrix,
     // VkPhysicalDeviceShaderFloatControls2Features, VkPhysicalDeviceVulkan14Features
     shaderFloatControls2,
+    // VkPhysicalDeviceShaderFmaFeaturesKHR
+    shaderFmaFloat16,
+    // VkPhysicalDeviceShaderFmaFeaturesKHR
+    shaderFmaFloat32,
+    // VkPhysicalDeviceShaderFmaFeaturesKHR
+    shaderFmaFloat64,
     // VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT
     shaderImageInt64Atomics,
     // VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT
diff --git a/layers/vulkan/generated/pnext_chain_extraction.cpp b/layers/vulkan/generated/pnext_chain_extraction.cpp
index c8ba73b..872bfac 100644
--- a/layers/vulkan/generated/pnext_chain_extraction.cpp
+++ b/layers/vulkan/generated/pnext_chain_extraction.cpp
@@ -1573,6 +1573,11 @@
             header->pNext = nullptr;
             delete reinterpret_cast<const VkPhysicalDeviceMaintenance8FeaturesKHR *>(header);
             break;
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FMA_FEATURES_KHR:
+            PnextChainFree(header->pNext);
+            header->pNext = nullptr;
+            delete reinterpret_cast<const VkPhysicalDeviceShaderFmaFeaturesKHR *>(header);
+            break;
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_9_FEATURES_KHR:
             PnextChainFree(header->pNext);
             header->pNext = nullptr;
diff --git a/layers/vulkan/generated/spirv_validation_helper.cpp b/layers/vulkan/generated/spirv_validation_helper.cpp
index 937dcb8..a8a05e7 100644
--- a/layers/vulkan/generated/spirv_validation_helper.cpp
+++ b/layers/vulkan/generated/spirv_validation_helper.cpp
@@ -284,6 +284,12 @@
         {spv::CapabilityFloat8CooperativeMatrixEXT, {0, &DeviceFeatures::shaderFloat8CooperativeMatrix, nullptr, ""}},
         {spv::CapabilityGraphARM, {0, &DeviceFeatures::dataGraph, nullptr, ""}},
         {spv::CapabilityUntypedPointersKHR, {0, &DeviceFeatures::shaderUntypedPointers, nullptr, ""}},
+        // Not found in current SPIR-V Headers
+        // {spv::CapabilityFMAKHR, {0, &DeviceFeatures::shaderFmaFloat16, nullptr, ""}},
+        // Not found in current SPIR-V Headers
+        // {spv::CapabilityFMAKHR, {0, &DeviceFeatures::shaderFmaFloat32, nullptr, ""}},
+        // Not found in current SPIR-V Headers
+        // {spv::CapabilityFMAKHR, {0, &DeviceFeatures::shaderFmaFloat64, nullptr, ""}},
     };
     // clang-format on
     return spirv_capabilities;
@@ -395,6 +401,7 @@
         {"SPV_KHR_expect_assume", {0, nullptr, &DeviceExtensions::vk_khr_shader_expect_assume, ""}},
         {"SPV_KHR_float_controls2", {VK_API_VERSION_1_4, nullptr, nullptr, ""}},
         {"SPV_KHR_float_controls2", {0, nullptr, &DeviceExtensions::vk_khr_shader_float_controls2, ""}},
+        {"SPV_KHR_fma", {0, nullptr, &DeviceExtensions::vk_khr_shader_fma, ""}},
         {"SPV_KHR_quad_control", {0, nullptr, &DeviceExtensions::vk_khr_shader_quad_control, ""}},
         {"SPV_KHR_bfloat16", {0, nullptr, &DeviceExtensions::vk_khr_shader_bfloat16, ""}},
         {"SPV_NV_raw_access_chains", {0, nullptr, &DeviceExtensions::vk_nv_raw_access_chains, ""}},
@@ -1308,6 +1315,7 @@
     {"SPV_KHR_subgroup_rotate", {{vvl::Version::_VK_VERSION_1_4}, {vvl::Extension::_VK_KHR_shader_subgroup_rotate}}},
     {"SPV_KHR_expect_assume", {{vvl::Version::_VK_VERSION_1_4}, {vvl::Extension::_VK_KHR_shader_expect_assume}}},
     {"SPV_KHR_float_controls2", {{vvl::Version::_VK_VERSION_1_4}, {vvl::Extension::_VK_KHR_shader_float_controls2}}},
+    {"SPV_KHR_fma", {{vvl::Extension::_VK_KHR_shader_fma}}},
     {"SPV_KHR_quad_control", {{vvl::Extension::_VK_KHR_shader_quad_control}}},
     {"SPV_KHR_bfloat16", {{vvl::Extension::_VK_KHR_shader_bfloat16}}},
     {"SPV_NV_raw_access_chains", {{vvl::Extension::_VK_NV_raw_access_chains}}},
diff --git a/layers/vulkan/generated/stateless_validation_helper.cpp b/layers/vulkan/generated/stateless_validation_helper.cpp
index ca0fdaf..a2bf3d4 100644
--- a/layers/vulkan/generated/stateless_validation_helper.cpp
+++ b/layers/vulkan/generated/stateless_validation_helper.cpp
@@ -1282,6 +1282,20 @@
             }
         } break;
 
+        // Validation code for VkPhysicalDeviceShaderFmaFeaturesKHR structure members
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FMA_FEATURES_KHR: {  // Covers
+                                                                           // VUID-VkPhysicalDeviceShaderFmaFeaturesKHR-sType-sType
+            if (is_const_param) {
+                [[maybe_unused]] const Location pNext_loc = loc.pNext(Struct::VkPhysicalDeviceShaderFmaFeaturesKHR);
+                VkPhysicalDeviceShaderFmaFeaturesKHR* structure = (VkPhysicalDeviceShaderFmaFeaturesKHR*)header;
+                skip |= ValidateBool32(pNext_loc.dot(Field::shaderFmaFloat16), structure->shaderFmaFloat16);
+
+                skip |= ValidateBool32(pNext_loc.dot(Field::shaderFmaFloat32), structure->shaderFmaFloat32);
+
+                skip |= ValidateBool32(pNext_loc.dot(Field::shaderFmaFloat64), structure->shaderFmaFloat64);
+            }
+        } break;
+
         // Validation code for VkPhysicalDeviceMaintenance9FeaturesKHR structure members
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_9_FEATURES_KHR: {  // Covers
                                                                               // VUID-VkPhysicalDeviceMaintenance9FeaturesKHR-sType-sType
@@ -7898,6 +7912,7 @@
             VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES,
             VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT8_FEATURES_EXT,
             VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT_CONTROLS_2_FEATURES,
+            VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FMA_FEATURES_KHR,
             VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT,
             VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_FOOTPRINT_FEATURES_NV,
             VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES,
@@ -18395,10 +18410,6 @@
                                   AllVkAddressCopyFlagBitsKHR, pCopyMemoryIndirectInfo->dstCopyFlags, kRequiredFlags,
                                   "VUID-VkCopyMemoryIndirectInfoKHR-dstCopyFlags-parameter",
                                   "VUID-VkCopyMemoryIndirectInfoKHR-dstCopyFlags-requiredbitmask", false);
-
-        skip |= context.ValidateNotZero(pCopyMemoryIndirectInfo->copyAddressRange.address == 0,
-                                        "VUID-VkStridedDeviceAddressRangeKHR-address-parameter",
-                                        pCopyMemoryIndirectInfo_loc.dot(Field::address));
     }
     return skip;
 }
@@ -18427,10 +18438,6 @@
                                       "VUID-VkCopyMemoryToImageIndirectInfoKHR-srcCopyFlags-parameter",
                                       "VUID-VkCopyMemoryToImageIndirectInfoKHR-srcCopyFlags-requiredbitmask", false);
 
-        skip |= context.ValidateNotZero(pCopyMemoryToImageIndirectInfo->copyAddressRange.address == 0,
-                                        "VUID-VkStridedDeviceAddressRangeKHR-address-parameter",
-                                        pCopyMemoryToImageIndirectInfo_loc.dot(Field::address));
-
         skip |= context.ValidateRequiredHandle(pCopyMemoryToImageIndirectInfo_loc.dot(Field::dstImage),
                                                pCopyMemoryToImageIndirectInfo->dstImage);
 
diff --git a/layers/vulkan/generated/sync_validation_types.cpp b/layers/vulkan/generated/sync_validation_types.cpp
index fada18a..971aa90 100644
--- a/layers/vulkan/generated/sync_validation_types.cpp
+++ b/layers/vulkan/generated/sync_validation_types.cpp
@@ -1747,17 +1747,6 @@
 
 const vvl::unordered_map<VkQueueFlagBits, VkPipelineStageFlags2>& syncAllCommandStagesByQueueFlags() {
     static const vvl::unordered_map<VkQueueFlagBits, VkPipelineStageFlags2> variable = {
-    { VK_QUEUE_TRANSFER_BIT, (
-        VK_PIPELINE_STAGE_2_COPY_INDIRECT_BIT_KHR |
-        VK_PIPELINE_STAGE_2_COPY_BIT |
-        VK_PIPELINE_STAGE_2_RESOLVE_BIT |
-        VK_PIPELINE_STAGE_2_BLIT_BIT |
-        VK_PIPELINE_STAGE_2_CLEAR_BIT |
-        VK_PIPELINE_STAGE_2_ACCELERATION_STRUCTURE_COPY_BIT_KHR |
-        VK_PIPELINE_STAGE_2_CONVERT_COOPERATIVE_VECTOR_MATRIX_BIT_NV |
-        VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT |
-        VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT
-    )},
     { VK_QUEUE_GRAPHICS_BIT, (
         VK_PIPELINE_STAGE_2_DRAW_INDIRECT_BIT |
         VK_PIPELINE_STAGE_2_COPY_INDIRECT_BIT_KHR |
@@ -1808,7 +1797,14 @@
         VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT |
         VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT
     )},
-    { VK_QUEUE_PROTECTED_BIT, (
+    { VK_QUEUE_TRANSFER_BIT, (
+        VK_PIPELINE_STAGE_2_COPY_INDIRECT_BIT_KHR |
+        VK_PIPELINE_STAGE_2_COPY_BIT |
+        VK_PIPELINE_STAGE_2_RESOLVE_BIT |
+        VK_PIPELINE_STAGE_2_BLIT_BIT |
+        VK_PIPELINE_STAGE_2_CLEAR_BIT |
+        VK_PIPELINE_STAGE_2_ACCELERATION_STRUCTURE_COPY_BIT_KHR |
+        VK_PIPELINE_STAGE_2_CONVERT_COOPERATIVE_VECTOR_MATRIX_BIT_NV |
         VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT |
         VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT
     )},
@@ -1816,8 +1812,7 @@
         VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT |
         VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT
     )},
-    { VK_QUEUE_OPTICAL_FLOW_BIT_NV, (
-        VK_PIPELINE_STAGE_2_OPTICAL_FLOW_BIT_NV |
+    { VK_QUEUE_PROTECTED_BIT, (
         VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT |
         VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT
     )},
@@ -1831,6 +1826,11 @@
         VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT |
         VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT
     )},
+    { VK_QUEUE_OPTICAL_FLOW_BIT_NV, (
+        VK_PIPELINE_STAGE_2_OPTICAL_FLOW_BIT_NV |
+        VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT |
+        VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT
+    )},
     { VK_QUEUE_DATA_GRAPH_BIT_ARM, (
         VK_PIPELINE_STAGE_2_DATA_GRAPH_BIT_ARM |
         VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT |
diff --git a/layers/vulkan/generated/test_icd_helper.h b/layers/vulkan/generated/test_icd_helper.h
index 7a270ba..0cb38e6 100644
--- a/layers/vulkan/generated/test_icd_helper.h
+++ b/layers/vulkan/generated/test_icd_helper.h
@@ -231,6 +231,7 @@
     {VK_KHR_SHADER_RELAXED_EXTENDED_INSTRUCTION_EXTENSION_NAME, VK_KHR_SHADER_RELAXED_EXTENDED_INSTRUCTION_SPEC_VERSION},
     {VK_KHR_MAINTENANCE_7_EXTENSION_NAME, VK_KHR_MAINTENANCE_7_SPEC_VERSION},
     {VK_KHR_MAINTENANCE_8_EXTENSION_NAME, VK_KHR_MAINTENANCE_8_SPEC_VERSION},
+    {VK_KHR_SHADER_FMA_EXTENSION_NAME, VK_KHR_SHADER_FMA_SPEC_VERSION},
     {VK_KHR_MAINTENANCE_9_EXTENSION_NAME, VK_KHR_MAINTENANCE_9_SPEC_VERSION},
     {VK_KHR_VIDEO_MAINTENANCE_2_EXTENSION_NAME, VK_KHR_VIDEO_MAINTENANCE_2_SPEC_VERSION},
     {VK_KHR_DEPTH_CLAMP_ZERO_ONE_EXTENSION_NAME, VK_KHR_DEPTH_CLAMP_ZERO_ONE_SPEC_VERSION},
diff --git a/layers/vulkan/generated/vk_extension_helper.cpp b/layers/vulkan/generated/vk_extension_helper.cpp
index df26f19..81963bd 100644
--- a/layers/vulkan/generated/vk_extension_helper.cpp
+++ b/layers/vulkan/generated/vk_extension_helper.cpp
@@ -157,6 +157,7 @@
         {"VK_KHR_shader_relaxed_extended_instruction", vvl::Extension::_VK_KHR_shader_relaxed_extended_instruction},
         {"VK_KHR_maintenance7", vvl::Extension::_VK_KHR_maintenance7},
         {"VK_KHR_maintenance8", vvl::Extension::_VK_KHR_maintenance8},
+        {"VK_KHR_shader_fma", vvl::Extension::_VK_KHR_shader_fma},
         {"VK_KHR_maintenance9", vvl::Extension::_VK_KHR_maintenance9},
         {"VK_KHR_video_maintenance2", vvl::Extension::_VK_KHR_video_maintenance2},
         {"VK_KHR_depth_clamp_zero_one", vvl::Extension::_VK_KHR_depth_clamp_zero_one},
@@ -1222,6 +1223,7 @@
          Info(&DeviceExtensions::vk_khr_maintenance7, {{{&DeviceExtensions::vk_feature_version_1_1, "VK_VERSION_1_1"}}})},
         {vvl::Extension::_VK_KHR_maintenance8,
          Info(&DeviceExtensions::vk_khr_maintenance8, {{{&DeviceExtensions::vk_feature_version_1_1, "VK_VERSION_1_1"}}})},
+        {vvl::Extension::_VK_KHR_shader_fma, Info(&DeviceExtensions::vk_khr_shader_fma, {})},
         {vvl::Extension::_VK_KHR_maintenance9,
          Info(&DeviceExtensions::vk_khr_maintenance9, {{{&DeviceExtensions::vk_khr_get_physical_device_properties2,
                                                          VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME}}})},
diff --git a/layers/vulkan/generated/vk_extension_helper.h b/layers/vulkan/generated/vk_extension_helper.h
index 8aa3afc..0cf5b3a 100644
--- a/layers/vulkan/generated/vk_extension_helper.h
+++ b/layers/vulkan/generated/vk_extension_helper.h
@@ -269,6 +269,7 @@
     ExtEnabled vk_khr_shader_relaxed_extended_instruction{kNotSupported};
     ExtEnabled vk_khr_maintenance7{kNotSupported};
     ExtEnabled vk_khr_maintenance8{kNotSupported};
+    ExtEnabled vk_khr_shader_fma{kNotSupported};
     ExtEnabled vk_khr_maintenance9{kNotSupported};
     ExtEnabled vk_khr_video_maintenance2{kNotSupported};
     ExtEnabled vk_khr_depth_clamp_zero_one{kNotSupported};
@@ -731,6 +732,7 @@
         case vvl::Extension::_VK_KHR_shader_relaxed_extended_instruction:
         case vvl::Extension::_VK_KHR_maintenance7:
         case vvl::Extension::_VK_KHR_maintenance8:
+        case vvl::Extension::_VK_KHR_shader_fma:
         case vvl::Extension::_VK_KHR_maintenance9:
         case vvl::Extension::_VK_KHR_video_maintenance2:
         case vvl::Extension::_VK_KHR_depth_clamp_zero_one:
diff --git a/layers/vulkan/generated/vk_validation_error_messages.h b/layers/vulkan/generated/vk_validation_error_messages.h
index 939687a..1a81867 100644
--- a/layers/vulkan/generated/vk_validation_error_messages.h
+++ b/layers/vulkan/generated/vk_validation_error_messages.h
@@ -1,6 +1,6 @@
 // *** THIS FILE IS GENERATED - DO NOT EDIT ***
 // See generate_spec_error_message.py for modifications
-// Based on Vulkan specification version: 1.4.328
+// Based on Vulkan specification version: 1.4.329
 
 /***************************************************************************
  *
@@ -34,7 +34,7 @@
 };
 
 const vvl::unordered_map<std::string_view, vuid_info> &GetVuidMap() {
-    static const std::array<std::pair<std::string_view, vuid_info>, 21089> vuid_array = {{
+    static const std::array<std::pair<std::string_view, vuid_info>, 21123> vuid_array = {{
         { {"VUID-BaryCoordKHR-BaryCoordKHR-04154", 36}, { {"The BaryCoordKHR decoration must be used only within the Fragment Execution Model", 81}, { "chapters/interfaces.html", 24} } },
         { {"VUID-BaryCoordKHR-BaryCoordKHR-04155", 36}, { {"The variable decorated with BaryCoordKHR must be declared using the Input Storage Class", 87}, { "chapters/interfaces.html", 24} } },
         { {"VUID-BaryCoordKHR-BaryCoordKHR-04156", 36}, { {"The variable decorated with BaryCoordKHR must be declared as a three-component vector of 32-bit floating-point values", 117}, { "chapters/interfaces.html", 24} } },
@@ -378,6 +378,7 @@
         { {"VUID-RuntimeSpirv-None-10716", 28}, { {"If a VkSampler object that enables sampler Y'CBCR conversion is statically used, it must only be used with OpImageSample* or OpImageSparseSample* instructions", 158}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-RuntimeSpirv-None-10824", 28}, { {"If the maintenance9 feature is not enabled, the Base operand of any OpBitCount, OpBitReverse, OpBitFieldInsert, OpBitFieldSExtract, or OpBitFieldUExtract instruction must be a 32-bit integer scalar or a vector of 32-bit integers", 228}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-RuntimeSpirv-None-10834", 28}, { {"Buffer indexing calculations must not wrap 32 bits", 50}, { "appendices/spirvenv.html", 24} } },
+        { {"VUID-RuntimeSpirv-None-10980", 28}, { {"Objects containing 8-bit integer or 8-bit floating-point elements must not have storage class of Input or Output", 112}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-RuntimeSpirv-Offset-06308", 30}, { {"The Offset plus size of the type of each variable, in the output interface of the entry point being compiled, decorated with XfbBuffer must not be greater than VkPhysicalDeviceTransformFeedbackPropertiesEXT::maxTransformFeedbackBufferDataSize", 242}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-RuntimeSpirv-Offset-06344", 30}, { {"The first element of the Offset operand of InterpolateAtOffset must be greater than or equal to: fragwidth x minInterpolationOffset where fragwidth is the width of the current fragment in pixels", 194}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-RuntimeSpirv-Offset-06345", 30}, { {"The first element of the Offset operand of InterpolateAtOffset must be less than or equal to fragwidth x (maxInterpolationOffset + ULP ) - ULP where fragwidth is the width of the current fragment in pixels and ULP = 1 / 2^subPixelInterpolationOffsetBits^", 254}, { "appendices/spirvenv.html", 24} } },
@@ -572,6 +573,9 @@
         { {"VUID-RuntimeSpirv-shaderEarlyAndLateFragmentTests-06772", 55}, { {"If the shaderEarlyAndLateFragmentTests feature is not enabled, the StencilRefLessFrontEXT Execution Mode must not be used", 121}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-RuntimeSpirv-shaderEarlyAndLateFragmentTests-06773", 55}, { {"If the shaderEarlyAndLateFragmentTests feature is not enabled, the StencilRefLessBackEXT Execution Mode must not be used", 120}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-RuntimeSpirv-shaderFloat16VectorAtomics-09581", 50}, { {"shaderFloat16VectorAtomics, must be enabled for 16-bit floating-point, 2- and 4-component vector atomic operations to be supported", 130}, { "appendices/spirvenv.html", 24} } },
+        { {"VUID-RuntimeSpirv-shaderFmaFloat16-10977", 40}, { {"shaderFmaFloat16 must be enabled for OpFmaKHR to be supported with a result type that includes a 16-bit float", 109}, { "appendices/spirvenv.html", 24} } },
+        { {"VUID-RuntimeSpirv-shaderFmaFloat32-10978", 40}, { {"shaderFmaFloat32 must be enabled for OpFmaKHR to be supported with a result type that includes a 32-bit float", 109}, { "appendices/spirvenv.html", 24} } },
+        { {"VUID-RuntimeSpirv-shaderFmaFloat64-10979", 40}, { {"shaderFmaFloat64 must be enabled for OpFmaKHR to be supported with a result type that includes a 64-bit float", 109}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-RuntimeSpirv-shaderRelaxedExtendedInstruction-10773", 56}, { {"If the shaderRelaxedExtendedInstruction feature is not enabled, the OpExtInstWithForwardRefsKHR must not be used", 112}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-RuntimeSpirv-shaderRoundingModeRTEFloat16-06302", 52}, { {"If shaderRoundingModeRTEFloat16 is VK_FALSE, then RoundingModeRTE for 16-bit floating-point type must not be used", 113}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-RuntimeSpirv-shaderRoundingModeRTEFloat32-06303", 52}, { {"If shaderRoundingModeRTEFloat32 is VK_FALSE, then RoundingModeRTE for 32-bit floating-point type must not be used", 113}, { "appendices/spirvenv.html", 24} } },
@@ -595,8 +599,8 @@
         { {"VUID-RuntimeSpirv-shaderZeroInitializeWorkgroupMemory-06372", 59}, { {"If the shaderZeroInitializeWorkgroupMemory feature is not enabled, any variable with Workgroup as its Storage Class must not have an Initializer operand", 152}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-RuntimeSpirv-storageBuffer16BitAccess-11161", 48}, { {"If storageBuffer16BitAccess is VK_FALSE, then objects containing 16-bit integer or 16-bit floating-point elements must not have Storage Class of StorageBuffer, ShaderRecordBufferKHR, or PhysicalStorageBuffer unless: storageBuffer8BitAccess is VK_TRUE, or the elements are accessed in 32-bit multiples if shaderUntypedPointers is VK_TRUE.", 337}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-RuntimeSpirv-storageBuffer8BitAccess-06328", 47}, { {"If storageBuffer8BitAccess is VK_FALSE, then objects containing an 8-bit integer element must not have Storage Class of StorageBuffer, ShaderRecordBufferKHR, or PhysicalStorageBuffer unless shaderUntypedPointers is VK_TRUE and they are accessed in: 32-bit multiples, or 16-bit multiples if storageBuffer16BitAccess is VK_TRUE.", 326}, { "appendices/spirvenv.html", 24} } },
-        { {"VUID-RuntimeSpirv-storageInputOutput16-11162", 44}, { {"If storageInputOutput16 is VK_FALSE, then objects containing 16-bit integer or 16-bit floating-point elements must not have storage class of Input or Output.", 157}, { "appendices/spirvenv.html", 24} } },
-        { {"VUID-RuntimeSpirv-storagePushConstant16-06333", 45}, { {"If storagePushConstant16 is VK_FALSE, then objects containing 16-bit integer or 16-bit floating-point elements must not have Storage Class of PushConstant unless: StoragePushConstant8 is VK_TRUE, or elements are accessed in 32-bit multiples if shaderUntypedPointers is VK_TRUE.", 277}, { "appendices/spirvenv.html", 24} } },
+        { {"VUID-RuntimeSpirv-storageInputOutput16-11162", 44}, { {"If storageInputOutput16 is VK_FALSE, then objects containing 16-bit integer or 16-bit floating-point elements must not have storage class of Input or Output", 156}, { "appendices/spirvenv.html", 24} } },
+        { {"VUID-RuntimeSpirv-storagePushConstant16-06333", 45}, { {"If storagePushConstant16 is VK_FALSE, then objects containing 16-bit integer or 16-bit floating-point elements must not have Storage Class of PushConstant unless: StoragePushConstant8 is VK_TRUE, or elements are accessed in 32-bit multiples if shaderUntypedPointers is VK_TRUE", 276}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-RuntimeSpirv-storagePushConstant8-06330", 44}, { {"If storagePushConstant8 is VK_FALSE, then objects containing an 8-bit integer element must not have Storage Class of PushConstant unless shaderUntypedPointers is VK_TRUE and they are accessed in: 32-bit multiples, or 16-bit multiples if storagePushConstant16 is VK_TRUE.", 270}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-RuntimeSpirv-subgroupBroadcastDynamicId-06276", 50}, { {"If subgroupBroadcastDynamicId is VK_TRUE, and the shader module version is 1.5 or higher, the \"Index\" for OpGroupNonUniformQuadBroadcast must be dynamically uniform within the derivative group. Otherwise, \"Index\" must be a constant", 235}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-RuntimeSpirv-subgroupBroadcastDynamicId-06277", 50}, { {"If subgroupBroadcastDynamicId is VK_TRUE, and the shader module version is 1.5 or higher, the \"Id\" for OpGroupNonUniformBroadcast must be dynamically uniform within the subgroup. Otherwise, \"Id\" must be a constant", 217}, { "appendices/spirvenv.html", 24} } },
@@ -613,7 +617,7 @@
         { {"VUID-RuntimeSpirv-tileShadingImageProcessing-10712", 50}, { {"If an OpTypeSampledImage with Storage Class TileAttachmentQCOM is consumed by any argument of the following operations, tileShadingImageProcessing must be enabled: OpImageSampleWeightedQCOM OpImageBoxFilterQCOM OpImageBlockMatch*QCOM", 233}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-RuntimeSpirv-tileSize-10705", 32}, { {"In compute shaders that enables SPIR-V capability TileShadingQCOM, VkTilePropertiesQCOM.tileSize.z % TileShadingRateQCOM::z must equal 0", 136}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-RuntimeSpirv-transformFeedbackStreamsLinesTriangles-06311", 62}, { {"If the geometry shader emits to more than one vertex stream and VkPhysicalDeviceTransformFeedbackPropertiesEXT::transformFeedbackStreamsLinesTriangles is VK_FALSE, then Execution Mode must be OutputPoints", 204}, { "appendices/spirvenv.html", 24} } },
-        { {"VUID-RuntimeSpirv-uniformAndStorageBuffer16BitAccess-06332", 58}, { {"If uniformAndStorageBuffer16BitAccess is VK_FALSE, then objects in the Uniform Storage Class with the Block decoration must not have 16-bit integer or 16-bit floating-point members unless: uniformAndStorageBuffer8BitAccess is VK_TRUE, or members are accessed in 32-bit multiples and shaderUntypedPointers is VK_TRUE.", 316}, { "appendices/spirvenv.html", 24} } },
+        { {"VUID-RuntimeSpirv-uniformAndStorageBuffer16BitAccess-06332", 58}, { {"If uniformAndStorageBuffer16BitAccess is VK_FALSE, then objects in the Uniform Storage Class with the Block decoration must not have 16-bit integer or 16-bit floating-point members unless: uniformAndStorageBuffer8BitAccess is VK_TRUE, or members are accessed in 32-bit multiples and shaderUntypedPointers is VK_TRUE", 315}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-RuntimeSpirv-uniformAndStorageBuffer8BitAccess-06329", 57}, { {"If uniformAndStorageBuffer8BitAccess is VK_FALSE, then objects in the Uniform Storage Class with the Block decoration must not have an 8-bit integer member unless shaderUntypedPointers is VK_TRUE and they are accessed in: 32-bit multiples, or 16-bit multiples if uniformAndStorageBuffer16BitAccess is VK_TRUE.", 309}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-RuntimeSpirv-vulkanMemoryModel-06265", 41}, { {"If the vulkanMemoryModel feature is enabled and the vulkanMemoryModelDeviceScope feature is not enabled, Device memory scope must not be used", 141}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-RuntimeSpirv-vulkanMemoryModel-06266", 41}, { {"If the vulkanMemoryModel feature is not enabled, QueueFamily memory scope must not be used", 90}, { "appendices/spirvenv.html", 24} } },
@@ -685,7 +689,7 @@
         { {"VUID-StandaloneSpirv-Input-09557", 32}, { {"The pointers of any Input or Output Interface user-defined variables must not contain any PhysicalStorageBuffer Storage Class pointers", 134}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-StandaloneSpirv-Input-10588", 32}, { {"Variables in the Input storage class in the TessellationControl, TessellationEvaluation, Geometry, or Fragment execution model must not have overlapping Component and Location decorations as defined by Location and Component Assignment", 235}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-StandaloneSpirv-Input-10604", 32}, { {"Any variable in the Input storage class in the Fragment execution model must not have an assigned Location shared with another variable with different decorations for PerVertexKHR, Flat, NoPerspective, Sample, or Centroid", 221}, { "appendices/spirvenv.html", 24} } },
-        { {"VUID-StandaloneSpirv-InputAttachmentArrayDynamicIndexing-10131", 62}, { {"If the InputAttachmentArrayDynamicIndexing capability is not declared, and an instruction accesses memory through an input attachment, the input attachmnet through which that memory is accessed must be determined by constant integral expressions", 245}, { "appendices/spirvenv.html", 24} } },
+        { {"VUID-StandaloneSpirv-InputAttachmentArrayDynamicIndexing-10131", 62}, { {"If the InputAttachmentArrayDynamicIndexing capability is not declared, and an instruction accesses memory through an input attachment, the input attachment through which that memory is accessed must be determined by constant integral expressions", 245}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-StandaloneSpirv-InputAttachmentIndex-06678", 47}, { {"Variables decorated with InputAttachmentIndex must be in the UniformConstant Storage Class", 90}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-StandaloneSpirv-Invariant-04677", 36}, { {"Variables decorated with Invariant and variables with structure types that have any members decorated with Invariant must be in the Output or Input Storage Class, Invariant used on an Input Storage Class variable or structure member has no effect", 246}, { "appendices/spirvenv.html", 24} } },
         { {"VUID-StandaloneSpirv-Location-04915", 35}, { {"The Location or Component decorations must not be used with BuiltIn", 67}, { "appendices/spirvenv.html", 24} } },
@@ -2459,16 +2463,16 @@
         { {"VUID-VkCopyImageToMemoryInfo-srcImageLayout-09065", 49}, { {"srcImageLayout must be one of the image layouts returned in VkPhysicalDeviceHostImageCopyProperties::pCopySrcLayouts", 116}, { "chapters/copies.html", 20} } },
         { {"VUID-VkCopyImageToMemoryInfo-srcImageLayout-parameter", 53}, { {"srcImageLayout must be a valid VkImageLayout value", 50}, { "chapters/copies.html", 20} } },
         { {"VUID-VkCopyMemoryIndirectCommandKHR-dstAddress-10959", 52}, { {"The dstAddress must be 4 byte aligned", 37}, { "chapters/copies.html", 20} } },
-        { {"VUID-VkCopyMemoryIndirectCommandKHR-dstAddress-10962", 52}, { {"The memory in range [dstAddress, dstAddress size - 1] must be within the bounds of the memory allocation backing dstAddress", 123}, { "chapters/copies.html", 20} } },
+        { {"VUID-VkCopyMemoryIndirectCommandKHR-dstAddress-10962", 52}, { {"The memory in range [dstAddress, dstAddress + size - 1] must be within the bounds of the memory allocation backing dstAddress", 125}, { "chapters/copies.html", 20} } },
         { {"VUID-VkCopyMemoryIndirectCommandKHR-dstAddress-parameter", 56}, { {"dstAddress must be a valid VkDeviceAddress value", 48}, { "chapters/copies.html", 20} } },
         { {"VUID-VkCopyMemoryIndirectCommandKHR-size-10960", 46}, { {"The size must be 4 byte aligned", 31}, { "chapters/copies.html", 20} } },
         { {"VUID-VkCopyMemoryIndirectCommandKHR-srcAddress-10958", 52}, { {"The srcAddress must be 4 byte aligned", 37}, { "chapters/copies.html", 20} } },
-        { {"VUID-VkCopyMemoryIndirectCommandKHR-srcAddress-10961", 52}, { {"The memory in range [srcAddress, srcAddress size - 1] must be within the bounds of the memory allocation backing srcAddress", 123}, { "chapters/copies.html", 20} } },
+        { {"VUID-VkCopyMemoryIndirectCommandKHR-srcAddress-10961", 52}, { {"The memory in range [srcAddress, srcAddress + size - 1] must be within the bounds of the memory allocation backing srcAddress", 125}, { "chapters/copies.html", 20} } },
         { {"VUID-VkCopyMemoryIndirectCommandKHR-srcAddress-parameter", 56}, { {"srcAddress must be a valid VkDeviceAddress value", 48}, { "chapters/copies.html", 20} } },
-        { {"VUID-VkCopyMemoryIndirectInfoKHR-copyAddressRange-10942", 55}, { {"copyAddressRange.pname:address must be 4 byte aligned", 53}, { "chapters/copies.html", 20} } },
-        { {"VUID-VkCopyMemoryIndirectInfoKHR-copyAddressRange-10943", 55}, { {"copyAddressRange.pname:stride must be a multiple of 4 and must be greater than or equal to sizeof(VkCopyMemoryIndirectCommandKHR)", 129}, { "chapters/copies.html", 20} } },
+        { {"VUID-VkCopyMemoryIndirectInfoKHR-copyAddressRange-10942", 55}, { {"copyAddressRange.address must be 4 byte aligned", 47}, { "chapters/copies.html", 20} } },
+        { {"VUID-VkCopyMemoryIndirectInfoKHR-copyAddressRange-10943", 55}, { {"copyAddressRange.stride must be a multiple of 4 and must be greater than or equal to sizeof(VkCopyMemoryIndirectCommandKHR)", 123}, { "chapters/copies.html", 20} } },
         { {"VUID-VkCopyMemoryIndirectInfoKHR-copyAddressRange-10945", 55}, { {"Any of the source or destination memory regions specified in copyAddressRange must not overlap with any of the specified destination memory regions", 147}, { "chapters/copies.html", 20} } },
-        { {"VUID-VkCopyMemoryIndirectInfoKHR-copyCount-10944", 48}, { {"copyCount must be less than or equal to copyAddressRange.pname:size / copyAddressRange.pname:stride", 99}, { "chapters/copies.html", 20} } },
+        { {"VUID-VkCopyMemoryIndirectInfoKHR-copyCount-10944", 48}, { {"copyCount must be less than or equal to copyAddressRange.size / copyAddressRange.stride", 87}, { "chapters/copies.html", 20} } },
         { {"VUID-VkCopyMemoryIndirectInfoKHR-dstCopyFlags-10939", 51}, { {"If dstCopyFlags contains VK_ADDRESS_COPY_SPARSE_BIT_KHR, the destination memory regions accessed must be fully-resident", 119}, { "chapters/copies.html", 20} } },
         { {"VUID-VkCopyMemoryIndirectInfoKHR-dstCopyFlags-10941", 51}, { {"dstCopyFlags must not contain VK_ADDRESS_COPY_PROTECTED_BIT_KHR", 63}, { "chapters/copies.html", 20} } },
         { {"VUID-VkCopyMemoryIndirectInfoKHR-dstCopyFlags-parameter", 55}, { {"dstCopyFlags must be a valid combination of VkAddressCopyFlagBitsKHR values", 75}, { "chapters/copies.html", 20} } },
@@ -2502,14 +2506,13 @@
         { {"VUID-VkCopyMemoryToImageIndirectCommandKHR-srcAddress-parameter", 63}, { {"srcAddress must be a valid VkDeviceAddress value", 48}, { "chapters/copies.html", 20} } },
         { {"VUID-VkCopyMemoryToImageIndirectInfoKHR-aspectMask-07662", 56}, { {"The aspectMask member for every subresource in pImageSubresources must only have a single bit set", 97}, { "chapters/copies.html", 20} } },
         { {"VUID-VkCopyMemoryToImageIndirectInfoKHR-commandBuffer-07674", 59}, { {"If the queue family used to create the VkCommandPool which commandBuffer was allocated from does not support VK_QUEUE_GRAPHICS_BIT, for each region, the aspectMask member of pImageSubresources must not be VK_IMAGE_ASPECT_DEPTH_BIT or VK_IMAGE_ASPECT_STENCIL_BIT", 261}, { "chapters/copies.html", 20} } },
-        { {"VUID-VkCopyMemoryToImageIndirectInfoKHR-copyAddressRange-10952", 62}, { {"copyAddressRange.pname:address must be 4 byte aligned", 53}, { "chapters/copies.html", 20} } },
-        { {"VUID-VkCopyMemoryToImageIndirectInfoKHR-copyAddressRange-10953", 62}, { {"copyAddressRange.pname:stride must be a multiple of 4 and must be greater than or equal to sizeof(VkCopyMemoryToImageIndirectCommandKHR)", 136}, { "chapters/copies.html", 20} } },
-        { {"VUID-VkCopyMemoryToImageIndirectInfoKHR-copyAddressRange-10954", 62}, { {"Any of the source or destination memory regions specified in copyAddressRange must not overlap with any of the specified destination memory regions", 147}, { "chapters/copies.html", 20} } },
-        { {"VUID-VkCopyMemoryToImageIndirectInfoKHR-copyBufferAddress-10975", 63}, { {"Any of the source or destination memory regions specified in copyBufferAddress must not overlap with any of the specified destination memory regions", 148}, { "chapters/copies.html", 20} } },
-        { {"VUID-VkCopyMemoryToImageIndirectInfoKHR-copyCount-10951", 55}, { {"copyCount must be less than or equal to copyAddressRange.pname:size / copyAddressRange.pname:stride", 99}, { "chapters/copies.html", 20} } },
+        { {"VUID-VkCopyMemoryToImageIndirectInfoKHR-copyAddressRange-10952", 62}, { {"copyAddressRange.address must be 4 byte aligned", 47}, { "chapters/copies.html", 20} } },
+        { {"VUID-VkCopyMemoryToImageIndirectInfoKHR-copyAddressRange-10953", 62}, { {"copyAddressRange.stride must be a multiple of 4 and must be greater than or equal to sizeof(VkCopyMemoryToImageIndirectCommandKHR)", 130}, { "chapters/copies.html", 20} } },
+        { {"VUID-VkCopyMemoryToImageIndirectInfoKHR-copyAddressRange-10975", 62}, { {"Any of the source or destination memory regions specified in copyAddressRange must not overlap with any of the specified destination memory regions", 147}, { "chapters/copies.html", 20} } },
+        { {"VUID-VkCopyMemoryToImageIndirectInfoKHR-copyCount-10951", 55}, { {"copyCount must be less than or equal to copyAddressRange.size / copyAddressRange.stride", 87}, { "chapters/copies.html", 20} } },
         { {"VUID-VkCopyMemoryToImageIndirectInfoKHR-copyCount-arraylength", 61}, { {"copyCount must be greater than 0", 32}, { "chapters/copies.html", 20} } },
         { {"VUID-VkCopyMemoryToImageIndirectInfoKHR-dstImage-07661", 54}, { {"dstImage must not be a protected image", 38}, { "chapters/copies.html", 20} } },
-        { {"VUID-VkCopyMemoryToImageIndirectInfoKHR-dstImage-07663", 54}, { {"The image region specified by each element in copyBufferAddress must be a region that is contained within dstImage", 114}, { "chapters/copies.html", 20} } },
+        { {"VUID-VkCopyMemoryToImageIndirectInfoKHR-dstImage-07663", 54}, { {"The image region specified by each element in copyAddressRange must be a region that is contained within dstImage", 113}, { "chapters/copies.html", 20} } },
         { {"VUID-VkCopyMemoryToImageIndirectInfoKHR-dstImage-07664", 54}, { {"dstImage must have been created with VK_IMAGE_USAGE_TRANSFER_DST_BIT usage flag", 79}, { "chapters/copies.html", 20} } },
         { {"VUID-VkCopyMemoryToImageIndirectInfoKHR-dstImage-07665", 54}, { {"If dstImage is non-sparse then it must be bound completely and contiguously to a single VkDeviceMemory object", 109}, { "chapters/copies.html", 20} } },
         { {"VUID-VkCopyMemoryToImageIndirectInfoKHR-dstImage-07673", 54}, { {"dstImage must not have been created with flags containing VK_IMAGE_CREATE_SUBSAMPLED_BIT_EXT", 92}, { "chapters/copies.html", 20} } },
@@ -2921,7 +2924,6 @@
         { {"VUID-VkDescriptorImageInfo-commonparent", 39}, { {"Both of imageView, and sampler that are valid handles of non-ignored parameters must have been created, allocated, or retrieved from the same VkDevice", 150}, { "chapters/descriptorsets.html", 28} } },
         { {"VUID-VkDescriptorImageInfo-descriptorType-06713", 47}, { {"If the image2DViewOf3D feature is not enabled or descriptorType is not VK_DESCRIPTOR_TYPE_STORAGE_IMAGE then imageView must not be a 2D view created from a 3D image", 164}, { "chapters/descriptorsets.html", 28} } },
         { {"VUID-VkDescriptorImageInfo-descriptorType-06714", 47}, { {"If the sampler2DViewOf3D feature is not enabled or descriptorType is not VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE or VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER then imageView must not be a 2D view created from a 3D image", 211}, { "chapters/descriptorsets.html", 28} } },
-        { {"VUID-VkDescriptorImageInfo-imageLayout-00344", 44}, { {"imageLayout must match the actual VkImageLayout of each subresource accessible from imageView at the time this descriptor is accessed as defined by the image layout matching rules", 179}, { "chapters/descriptorsets.html", 28} } },
         { {"VUID-VkDescriptorImageInfo-imageLayout-09425", 44}, { {"If imageLayout is VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, then the aspectMask used to create imageView must not include either VK_IMAGE_ASPECT_DEPTH_BIT or VK_IMAGE_ASPECT_STENCIL_BIT", 185}, { "chapters/descriptorsets.html", 28} } },
         { {"VUID-VkDescriptorImageInfo-imageLayout-09426", 44}, { {"If imageLayout is VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL or VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, then the aspectMask used to create imageView must not include VK_IMAGE_ASPECT_COLOR_BIT", 496}, { "chapters/descriptorsets.html", 28} } },
         { {"VUID-VkDescriptorImageInfo-imageView-01976", 42}, { {"If imageView is created from a depth/stencil image, the aspectMask used to create the imageView must include either VK_IMAGE_ASPECT_DEPTH_BIT or VK_IMAGE_ASPECT_STENCIL_BIT but not both", 185}, { "chapters/descriptorsets.html", 28} } },
@@ -5879,6 +5881,7 @@
         { {"VUID-VkPhysicalDeviceShaderFloat16Int8Features-sType-sType", 58}, { {"sType must be VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES", 76}, { "chapters/features.html", 22} } },
         { {"VUID-VkPhysicalDeviceShaderFloat8FeaturesEXT-sType-sType", 56}, { {"sType must be VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT8_FEATURES_EXT", 74}, { "chapters/features.html", 22} } },
         { {"VUID-VkPhysicalDeviceShaderFloatControls2Features-sType-sType", 61}, { {"sType must be VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT_CONTROLS_2_FEATURES", 80}, { "chapters/features.html", 22} } },
+        { {"VUID-VkPhysicalDeviceShaderFmaFeaturesKHR-sType-sType", 53}, { {"sType must be VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FMA_FEATURES_KHR", 71}, { "chapters/features.html", 22} } },
         { {"VUID-VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT-sType-sType", 66}, { {"sType must be VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT", 86}, { "chapters/features.html", 22} } },
         { {"VUID-VkPhysicalDeviceShaderImageFootprintFeaturesNV-sType-sType", 63}, { {"sType must be VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_FOOTPRINT_FEATURES_NV", 82}, { "chapters/features.html", 22} } },
         { {"VUID-VkPhysicalDeviceShaderIntegerDotProductFeatures-sType-sType", 64}, { {"sType must be VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES", 83}, { "chapters/features.html", 22} } },
@@ -7435,8 +7438,8 @@
         { {"VUID-VkStreamDescriptorSurfaceCreateInfoGGP-streamDescriptor-02681", 66}, { {"streamDescriptor must be a valid GgpStreamDescriptor", 52}, { "chapters/VK_KHR_surface/wsi.html", 32} } },
         { {"VUID-VkStridedDeviceAddressNV-startAddress-parameter", 52}, { {"startAddress must be a valid VkDeviceAddress value", 50}, { "chapters/accelstructures.html", 29} } },
         { {"VUID-VkStridedDeviceAddressRangeKHR-address-11365", 49}, { {"The sum of address and size must be less than or equal to the sum of an address retrieved from a VkBuffer and the value of VkBufferCreateInfo::size used to create that VkBuffer", 176}, { "chapters/fundamentals.html", 26} } },
-        { {"VUID-VkStridedDeviceAddressRangeKHR-address-parameter", 53}, { {"address must be a valid VkDeviceAddress value", 45}, { "chapters/fundamentals.html", 26} } },
-        { {"VUID-VkStridedDeviceAddressRangeKHR-size-11366", 46}, { {"If size is not 0 and the buffer from which address was queried is non-sparse, then the buffer must be bound completely and contiguously to a single VkDeviceMemory object", 169}, { "chapters/fundamentals.html", 26} } },
+        { {"VUID-VkStridedDeviceAddressRangeKHR-address-parameter", 53}, { {"If address is not 0, address must be a valid VkDeviceAddress value", 66}, { "chapters/fundamentals.html", 26} } },
+        { {"VUID-VkStridedDeviceAddressRangeKHR-size-11411", 46}, { {"If size is not 0, address must not be 0", 39}, { "chapters/fundamentals.html", 26} } },
         { {"VUID-VkStridedDeviceAddressRangeKHR-stride-10957", 48}, { {"stride must be less than or equal to size", 41}, { "chapters/fundamentals.html", 26} } },
         { {"VUID-VkStridedDeviceAddressRegionKHR-deviceAddress-parameter", 60}, { {"If deviceAddress is not 0, deviceAddress must be a valid VkDeviceAddress value", 78}, { "chapters/resources.html", 23} } },
         { {"VUID-VkStridedDeviceAddressRegionKHR-size-04631", 47}, { {"If size is not zero, all addresses between deviceAddress and deviceAddress + size - 1 must be in the buffer device address range of the same buffer", 147}, { "chapters/resources.html", 23} } },
@@ -7922,7 +7925,6 @@
         { {"VUID-VkTextureLODGatherFormatPropertiesAMD-sType-sType", 54}, { {"sType must be VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD", 72}, { "chapters/capabilities.html", 26} } },
         { {"VUID-VkTileMemoryBindInfoQCOM-memory-10726", 42}, { {"memory must have been allocated from a VkMemoryHeap with the VK_MEMORY_HEAP_TILE_MEMORY_BIT_QCOM property", 105}, { "chapters/memory.html", 20} } },
         { {"VUID-VkTileMemoryBindInfoQCOM-memory-parameter", 46}, { {"memory must be a valid VkDeviceMemory handle", 44}, { "chapters/memory.html", 20} } },
-        { {"VUID-VkTileMemoryBindInfoQCOM-memoryTypeIndex", 45}, { {"If the tileMemoryHeap feature is not enabled, pAllocateInfo->memoryTypeIndex must not identify a memory type that corresponds to a VkMemoryHeap with the VK_MEMORY_HEAP_TILE_MEMORY_BIT_QCOM property", 197}, { "chapters/memory.html", 20} } },
         { {"VUID-VkTileMemoryBindInfoQCOM-sType-sType", 41}, { {"sType must be VK_STRUCTURE_TYPE_TILE_MEMORY_BIND_INFO_QCOM", 58}, { "chapters/memory.html", 20} } },
         { {"VUID-VkTileMemoryRequirementsQCOM-sType-sType", 45}, { {"sType must be VK_STRUCTURE_TYPE_TILE_MEMORY_REQUIREMENTS_QCOM", 61}, { "chapters/resources.html", 23} } },
         { {"VUID-VkTileMemorySizeInfoQCOM-sType-sType", 41}, { {"sType must be VK_STRUCTURE_TYPE_TILE_MEMORY_SIZE_INFO_QCOM", 58}, { "chapters/renderpass.html", 24} } },
@@ -8680,6 +8682,7 @@
         { {"VUID-vkAllocateMemory-pAllocateInfo-parameter", 45}, { {"pAllocateInfo must be a valid pointer to a valid VkMemoryAllocateInfo structure", 79}, { "chapters/memory.html", 20} } },
         { {"VUID-vkAllocateMemory-pAllocator-parameter", 42}, { {"If pAllocator is not NULL, pAllocator must be a valid pointer to a valid VkAllocationCallbacks structure", 104}, { "chapters/memory.html", 20} } },
         { {"VUID-vkAllocateMemory-pMemory-parameter", 39}, { {"pMemory must be a valid pointer to a VkDeviceMemory handle", 58}, { "chapters/memory.html", 20} } },
+        { {"VUID-vkAllocateMemory-tileMemoryHeap-10976", 42}, { {"If the tileMemoryHeap feature is not enabled, pAllocateInfo->memoryTypeIndex must not identify a memory type that corresponds to a VkMemoryHeap with the VK_MEMORY_HEAP_TILE_MEMORY_BIT_QCOM property", 197}, { "chapters/memory.html", 20} } },
         { {"VUID-vkAntiLagUpdateAMD-antiLag-10061", 37}, { {"The antiLag feature must be enabled", 35}, { "chapters/VK_KHR_surface/wsi.html", 32} } },
         { {"VUID-vkAntiLagUpdateAMD-device-parameter", 40}, { {"device must be a valid VkDevice handle", 38}, { "chapters/VK_KHR_surface/wsi.html", 32} } },
         { {"VUID-vkAntiLagUpdateAMD-pData-parameter", 39}, { {"pData must be a valid pointer to a valid VkAntiLagDataAMD structure", 67}, { "chapters/VK_KHR_surface/wsi.html", 32} } },
@@ -10382,6 +10385,7 @@
         { {"VUID-vkCmdDispatch-groupCountX-00386", 36}, { {"groupCountX must be less than or equal to VkPhysicalDeviceLimits::maxComputeWorkGroupCount[0]", 93}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdDispatch-groupCountY-00387", 36}, { {"groupCountY must be less than or equal to VkPhysicalDeviceLimits::maxComputeWorkGroupCount[1]", 93}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdDispatch-groupCountZ-00388", 36}, { {"groupCountZ must be less than or equal to VkPhysicalDeviceLimits::maxComputeWorkGroupCount[2]", 93}, { "chapters/dispatch.html", 22} } },
+        { {"VUID-vkCmdDispatch-imageLayout-00344", 36}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdDispatch-magFilter-04553", 34}, { {"If a VkSampler created with magFilter or minFilter equal to VK_FILTER_LINEAR, reductionMode equal to VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE, and compareEnable equal to VK_FALSE is used to sample a VkImageView as a result of this command, then the image view's format features must contain VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT", 342}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdDispatch-magFilter-09598", 34}, { {"If a VkSampler created with magFilter or minFilter equal to VK_FILTER_LINEAR and reductionMode equal to either VK_SAMPLER_REDUCTION_MODE_MIN or VK_SAMPLER_REDUCTION_MODE_MAX is used to sample a VkImageView as a result of this command, then the image view's format features must contain VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_MINMAX_BIT", 335}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdDispatch-maintenance4-08602", 37}, { {"If the maintenance4 feature is not enabled, then for each push constant that is statically used by a bound shader, a push constant value must have been set for the same pipeline bind point, with a VkPipelineLayout that is compatible for push constants, with the VkPipelineLayout used to create the current VkPipeline or the VkDescriptorSetLayout and VkPushConstantRange arrays used to create the current VkShaderEXT , as described in Pipeline Layout Compatibility", 463}, { "chapters/dispatch.html", 22} } },
@@ -10473,6 +10477,7 @@
         { {"VUID-vkCmdDispatchBase-groupCountX-00424", 40}, { {"groupCountX must be less than or equal to VkPhysicalDeviceLimits::maxComputeWorkGroupCount[0] minus baseGroupX", 110}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdDispatchBase-groupCountY-00425", 40}, { {"groupCountY must be less than or equal to VkPhysicalDeviceLimits::maxComputeWorkGroupCount[1] minus baseGroupY", 110}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdDispatchBase-groupCountZ-00426", 40}, { {"groupCountZ must be less than or equal to VkPhysicalDeviceLimits::maxComputeWorkGroupCount[2] minus baseGroupZ", 110}, { "chapters/dispatch.html", 22} } },
+        { {"VUID-vkCmdDispatchBase-imageLayout-00344", 40}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdDispatchBase-magFilter-04553", 38}, { {"If a VkSampler created with magFilter or minFilter equal to VK_FILTER_LINEAR, reductionMode equal to VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE, and compareEnable equal to VK_FALSE is used to sample a VkImageView as a result of this command, then the image view's format features must contain VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT", 342}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdDispatchBase-magFilter-09598", 38}, { {"If a VkSampler created with magFilter or minFilter equal to VK_FILTER_LINEAR and reductionMode equal to either VK_SAMPLER_REDUCTION_MODE_MIN or VK_SAMPLER_REDUCTION_MODE_MAX is used to sample a VkImageView as a result of this command, then the image view's format features must contain VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_MINMAX_BIT", 335}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdDispatchBase-maintenance4-08602", 41}, { {"If the maintenance4 feature is not enabled, then for each push constant that is statically used by a bound shader, a push constant value must have been set for the same pipeline bind point, with a VkPipelineLayout that is compatible for push constants, with the VkPipelineLayout used to create the current VkPipeline or the VkDescriptorSetLayout and VkPushConstantRange arrays used to create the current VkShaderEXT , as described in Pipeline Layout Compatibility", 463}, { "chapters/dispatch.html", 22} } },
@@ -10576,6 +10581,7 @@
         { {"VUID-vkCmdDispatchGraphAMDX-filterCubicMinmax-02695", 51}, { {"Any VkImageView being sampled with VK_FILTER_CUBIC_EXT with a reduction mode of either VK_SAMPLER_REDUCTION_MODE_MIN or VK_SAMPLER_REDUCTION_MODE_MAX as a result of this command must have a VkImageViewType and format that supports cubic filtering together with minmax filtering, as specified by VkFilterCubicImageViewImageFormatPropertiesEXT::filterCubicMinmax returned by vkGetPhysicalDeviceImageFormatProperties2", 414}, { "chapters/executiongraphs.html", 29} } },
         { {"VUID-vkCmdDispatchGraphAMDX-flags-02696", 39}, { {"Any VkImage created with a VkImageCreateInfo::flags containing VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV sampled as a result of this command must only be sampled using a VkSamplerAddressMode of VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE", 227}, { "chapters/executiongraphs.html", 29} } },
         { {"VUID-vkCmdDispatchGraphAMDX-format-07753", 40}, { {"If a VkImageView or VkBufferView is accessed as a result of this command, then the numeric type of the view's format and the Sampled Type operand of the OpTypeImage must match", 175}, { "chapters/executiongraphs.html", 29} } },
+        { {"VUID-vkCmdDispatchGraphAMDX-imageLayout-00344", 45}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/executiongraphs.html", 29} } },
         { {"VUID-vkCmdDispatchGraphAMDX-infos-09146", 39}, { {"Host memory locations at indexes in the range [infos, infos + (count*stride)), at a granularity of stride must contain valid VkDispatchGraphInfoAMDX structures in the first 24 bytes", 181}, { "chapters/executiongraphs.html", 29} } },
         { {"VUID-vkCmdDispatchGraphAMDX-magFilter-04553", 43}, { {"If a VkSampler created with magFilter or minFilter equal to VK_FILTER_LINEAR, reductionMode equal to VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE, and compareEnable equal to VK_FALSE is used to sample a VkImageView as a result of this command, then the image view's format features must contain VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT", 342}, { "chapters/executiongraphs.html", 29} } },
         { {"VUID-vkCmdDispatchGraphAMDX-magFilter-09598", 43}, { {"If a VkSampler created with magFilter or minFilter equal to VK_FILTER_LINEAR and reductionMode equal to either VK_SAMPLER_REDUCTION_MODE_MIN or VK_SAMPLER_REDUCTION_MODE_MAX is used to sample a VkImageView as a result of this command, then the image view's format features must contain VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_MINMAX_BIT", 335}, { "chapters/executiongraphs.html", 29} } },
@@ -10669,6 +10675,7 @@
         { {"VUID-vkCmdDispatchGraphIndirectAMDX-filterCubicMinmax-02695", 59}, { {"Any VkImageView being sampled with VK_FILTER_CUBIC_EXT with a reduction mode of either VK_SAMPLER_REDUCTION_MODE_MIN or VK_SAMPLER_REDUCTION_MODE_MAX as a result of this command must have a VkImageViewType and format that supports cubic filtering together with minmax filtering, as specified by VkFilterCubicImageViewImageFormatPropertiesEXT::filterCubicMinmax returned by vkGetPhysicalDeviceImageFormatProperties2", 414}, { "chapters/executiongraphs.html", 29} } },
         { {"VUID-vkCmdDispatchGraphIndirectAMDX-flags-02696", 47}, { {"Any VkImage created with a VkImageCreateInfo::flags containing VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV sampled as a result of this command must only be sampled using a VkSamplerAddressMode of VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE", 227}, { "chapters/executiongraphs.html", 29} } },
         { {"VUID-vkCmdDispatchGraphIndirectAMDX-format-07753", 48}, { {"If a VkImageView or VkBufferView is accessed as a result of this command, then the numeric type of the view's format and the Sampled Type operand of the OpTypeImage must match", 175}, { "chapters/executiongraphs.html", 29} } },
+        { {"VUID-vkCmdDispatchGraphIndirectAMDX-imageLayout-00344", 53}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/executiongraphs.html", 29} } },
         { {"VUID-vkCmdDispatchGraphIndirectAMDX-infos-09153", 47}, { {"Device memory locations at indexes in the range [infos, infos + (count*stride)), at a granularity of stride must contain valid VkDispatchGraphInfoAMDX structures in the first 24 bytes when this command is executed on the device", 227}, { "chapters/executiongraphs.html", 29} } },
         { {"VUID-vkCmdDispatchGraphIndirectAMDX-magFilter-04553", 51}, { {"If a VkSampler created with magFilter or minFilter equal to VK_FILTER_LINEAR, reductionMode equal to VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE, and compareEnable equal to VK_FALSE is used to sample a VkImageView as a result of this command, then the image view's format features must contain VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT", 342}, { "chapters/executiongraphs.html", 29} } },
         { {"VUID-vkCmdDispatchGraphIndirectAMDX-magFilter-09598", 51}, { {"If a VkSampler created with magFilter or minFilter equal to VK_FILTER_LINEAR and reductionMode equal to either VK_SAMPLER_REDUCTION_MODE_MIN or VK_SAMPLER_REDUCTION_MODE_MAX is used to sample a VkImageView as a result of this command, then the image view's format features must contain VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_MINMAX_BIT", 335}, { "chapters/executiongraphs.html", 29} } },
@@ -10778,6 +10785,7 @@
         { {"VUID-vkCmdDispatchGraphIndirectCountAMDX-filterCubicMinmax-02695", 64}, { {"Any VkImageView being sampled with VK_FILTER_CUBIC_EXT with a reduction mode of either VK_SAMPLER_REDUCTION_MODE_MIN or VK_SAMPLER_REDUCTION_MODE_MAX as a result of this command must have a VkImageViewType and format that supports cubic filtering together with minmax filtering, as specified by VkFilterCubicImageViewImageFormatPropertiesEXT::filterCubicMinmax returned by vkGetPhysicalDeviceImageFormatProperties2", 414}, { "chapters/executiongraphs.html", 29} } },
         { {"VUID-vkCmdDispatchGraphIndirectCountAMDX-flags-02696", 52}, { {"Any VkImage created with a VkImageCreateInfo::flags containing VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV sampled as a result of this command must only be sampled using a VkSamplerAddressMode of VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE", 227}, { "chapters/executiongraphs.html", 29} } },
         { {"VUID-vkCmdDispatchGraphIndirectCountAMDX-format-07753", 53}, { {"If a VkImageView or VkBufferView is accessed as a result of this command, then the numeric type of the view's format and the Sampled Type operand of the OpTypeImage must match", 175}, { "chapters/executiongraphs.html", 29} } },
+        { {"VUID-vkCmdDispatchGraphIndirectCountAMDX-imageLayout-00344", 58}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/executiongraphs.html", 29} } },
         { {"VUID-vkCmdDispatchGraphIndirectCountAMDX-infos-09165", 52}, { {"Device memory locations at indexes in the range [infos, infos + (count*stride)), at a granularity of stride must contain valid VkDispatchGraphInfoAMDX structures in the first 24 bytes when this command is executed on the device", 227}, { "chapters/executiongraphs.html", 29} } },
         { {"VUID-vkCmdDispatchGraphIndirectCountAMDX-magFilter-04553", 56}, { {"If a VkSampler created with magFilter or minFilter equal to VK_FILTER_LINEAR, reductionMode equal to VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE, and compareEnable equal to VK_FALSE is used to sample a VkImageView as a result of this command, then the image view's format features must contain VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT", 342}, { "chapters/executiongraphs.html", 29} } },
         { {"VUID-vkCmdDispatchGraphIndirectCountAMDX-magFilter-09598", 56}, { {"If a VkSampler created with magFilter or minFilter equal to VK_FILTER_LINEAR and reductionMode equal to either VK_SAMPLER_REDUCTION_MODE_MIN or VK_SAMPLER_REDUCTION_MODE_MAX is used to sample a VkImageView as a result of this command, then the image view's format features must contain VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_MINMAX_BIT", 335}, { "chapters/executiongraphs.html", 29} } },
@@ -10872,6 +10880,7 @@
         { {"VUID-vkCmdDispatchIndirect-filterCubicMinmax-02695", 50}, { {"Any VkImageView being sampled with VK_FILTER_CUBIC_EXT with a reduction mode of either VK_SAMPLER_REDUCTION_MODE_MIN or VK_SAMPLER_REDUCTION_MODE_MAX as a result of this command must have a VkImageViewType and format that supports cubic filtering together with minmax filtering, as specified by VkFilterCubicImageViewImageFormatPropertiesEXT::filterCubicMinmax returned by vkGetPhysicalDeviceImageFormatProperties2", 414}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdDispatchIndirect-flags-02696", 38}, { {"Any VkImage created with a VkImageCreateInfo::flags containing VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV sampled as a result of this command must only be sampled using a VkSamplerAddressMode of VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE", 227}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdDispatchIndirect-format-07753", 39}, { {"If a VkImageView or VkBufferView is accessed as a result of this command, then the numeric type of the view's format and the Sampled Type operand of the OpTypeImage must match", 175}, { "chapters/dispatch.html", 22} } },
+        { {"VUID-vkCmdDispatchIndirect-imageLayout-00344", 44}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdDispatchIndirect-magFilter-04553", 42}, { {"If a VkSampler created with magFilter or minFilter equal to VK_FILTER_LINEAR, reductionMode equal to VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE, and compareEnable equal to VK_FALSE is used to sample a VkImageView as a result of this command, then the image view's format features must contain VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT", 342}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdDispatchIndirect-magFilter-09598", 42}, { {"If a VkSampler created with magFilter or minFilter equal to VK_FILTER_LINEAR and reductionMode equal to either VK_SAMPLER_REDUCTION_MODE_MIN or VK_SAMPLER_REDUCTION_MODE_MAX is used to sample a VkImageView as a result of this command, then the image view's format features must contain VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_MINMAX_BIT", 335}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdDispatchIndirect-maintenance4-08602", 45}, { {"If the maintenance4 feature is not enabled, then for each push constant that is statically used by a bound shader, a push constant value must have been set for the same pipeline bind point, with a VkPipelineLayout that is compatible for push constants, with the VkPipelineLayout used to create the current VkPipeline or the VkDescriptorSetLayout and VkPushConstantRange arrays used to create the current VkShaderEXT , as described in Pipeline Layout Compatibility", 463}, { "chapters/dispatch.html", 22} } },
@@ -10960,6 +10969,7 @@
         { {"VUID-vkCmdDispatchTileQCOM-filterCubicMinmax-02695", 50}, { {"Any VkImageView being sampled with VK_FILTER_CUBIC_EXT with a reduction mode of either VK_SAMPLER_REDUCTION_MODE_MIN or VK_SAMPLER_REDUCTION_MODE_MAX as a result of this command must have a VkImageViewType and format that supports cubic filtering together with minmax filtering, as specified by VkFilterCubicImageViewImageFormatPropertiesEXT::filterCubicMinmax returned by vkGetPhysicalDeviceImageFormatProperties2", 414}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdDispatchTileQCOM-flags-02696", 38}, { {"Any VkImage created with a VkImageCreateInfo::flags containing VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV sampled as a result of this command must only be sampled using a VkSamplerAddressMode of VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE", 227}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdDispatchTileQCOM-format-07753", 39}, { {"If a VkImageView or VkBufferView is accessed as a result of this command, then the numeric type of the view's format and the Sampled Type operand of the OpTypeImage must match", 175}, { "chapters/dispatch.html", 22} } },
+        { {"VUID-vkCmdDispatchTileQCOM-imageLayout-00344", 44}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdDispatchTileQCOM-magFilter-04553", 42}, { {"If a VkSampler created with magFilter or minFilter equal to VK_FILTER_LINEAR, reductionMode equal to VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE, and compareEnable equal to VK_FALSE is used to sample a VkImageView as a result of this command, then the image view's format features must contain VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT", 342}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdDispatchTileQCOM-magFilter-09598", 42}, { {"If a VkSampler created with magFilter or minFilter equal to VK_FILTER_LINEAR and reductionMode equal to either VK_SAMPLER_REDUCTION_MODE_MIN or VK_SAMPLER_REDUCTION_MODE_MAX is used to sample a VkImageView as a result of this command, then the image view's format features must contain VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_MINMAX_BIT", 335}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdDispatchTileQCOM-maintenance4-08602", 45}, { {"If the maintenance4 feature is not enabled, then for each push constant that is statically used by a bound shader, a push constant value must have been set for the same pipeline bind point, with a VkPipelineLayout that is compatible for push constants, with the VkPipelineLayout used to create the current VkPipeline or the VkDescriptorSetLayout and VkPushConstantRange arrays used to create the current VkShaderEXT , as described in Pipeline Layout Compatibility", 463}, { "chapters/dispatch.html", 22} } },
@@ -11018,8 +11028,8 @@
         { {"VUID-vkCmdDraw-None-07639", 25}, { {"If the depthClipControl feature is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE_EXT dynamic state enabled, then vkCmdSetDepthClipNegativeOneToOneEXT must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 385}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDraw-None-07640", 25}, { {"If the VK_NV_clip_space_w_scaling extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_ENABLE_NV dynamic state enabled, then vkCmdSetViewportWScalingEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 387}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDraw-None-07641", 25}, { {"If the VK_NV_viewport_swizzle extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_SWIZZLE_NV dynamic state enabled, then vkCmdSetViewportSwizzleNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 367}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDraw-None-07642", 25}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 469}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDraw-None-07643", 25}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 528}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDraw-None-07642", 25}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDraw-None-07643", 25}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 508}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDraw-None-07644", 25}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_MODE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageModulationModeNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDraw-None-07645", 25}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_ENABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationMode is any value other than VK_COVERAGE_MODULATION_MODE_NONE_NV, then vkCmdSetCoverageModulationTableEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 569}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDraw-None-07646", 25}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationTableEnable is VK_TRUE, then vkCmdSetCoverageModulationTableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 514}, { "chapters/drawing.html", 21} } },
@@ -11193,6 +11203,7 @@
         { {"VUID-vkCmdDraw-format-08937", 27}, { {"If there is a shader object bound to the VK_SHADER_STAGE_VERTEX_BIT stage or the bound graphics pipeline state was created with the VK_DYNAMIC_STATE_VERTEX_INPUT_EXT dynamic state enabled and the scalar width associated with a Location decorated Input variable in the Vertex Execution Model OpEntryPoint is 64-bit, then the corresponding VkVertexInputAttributeDescription2EXT::format must have a 64-bit component", 412}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDraw-format-10389", 27}, { {"For each vertex attribute accessed by this command, if its VkVertexInputAttributeDescription::format or VkVertexInputAttributeDescription2EXT::format is a packed format, and the legacyVertexAttributes feature is not enabled, the value of attribAddress, calculated as described in Vertex Input Calculation, must be a multiple of the size of the format", 350}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDraw-format-10390", 27}, { {"For each vertex attribute accessed by this command, if its VkVertexInputAttributeDescription::format or VkVertexInputAttributeDescription2EXT::format is not a packed format, and either the legacyVertexAttributes feature is not enabled or format has 64-bit components, the value of attribAddress, calculated as described in Vertex Input Calculation, must be a multiple of the component size of the format", 403}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDraw-imageLayout-00344", 32}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDraw-imageView-06172", 30}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the depth attachment", 292}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDraw-imageView-06173", 30}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pStencilAttachment is not VK_NULL_HANDLE, and the layout member of pStencilAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the stencil attachment", 298}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDraw-imageView-06174", 30}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, this command must not write any values to the depth attachment", 303}, { "chapters/drawing.html", 21} } },
@@ -11229,7 +11240,7 @@
         { {"VUID-vkCmdDraw-pStencilAttachment-06187", 39}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the bound pipeline was created with a VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV structure, and VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, the value of the depthStencilAttachmentSamples member of VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV used to create the bound graphics pipeline must be equal to the sample count used to create VkRenderingInfo::pStencilAttachment->imageView", 519}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDraw-pStencilAttachment-08965", 39}, { {"If the current render pass instance was begun with vkCmdBeginRendering, there is a graphics pipeline bound, stencil test is enabled and the VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, then the VkPipelineRenderingCreateInfo::stencilAttachmentFormat used to create the pipeline must not be VK_FORMAT_UNDEFINED", 334}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDraw-pStrides-04913", 29}, { {"If the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE dynamic state enabled, but without the VK_DYNAMIC_STATE_VERTEX_INPUT_EXT dynamic state enabled, then vkCmdBindVertexBuffers2 must have been called and not subsequently invalidated in the current command buffer prior to this draw command, and the pStrides parameter of vkCmdBindVertexBuffers2 must not be NULL", 405}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDraw-pipelineFragmentShadingRate-09238", 48}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 459}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDraw-pipelineFragmentShadingRate-09238", 48}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 439}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDraw-primitiveFragmentShadingRateWithMultipleViewports-04552", 70}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT dynamic state enabled, and any of the shader stages of the bound graphics pipeline write to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 481}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDraw-primitiveFragmentShadingRateWithMultipleViewports-08642", 70}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, and any shader object bound to a graphics stage writes to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 361}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDraw-primitiveTopology-10286", 38}, { {"If a VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT stage is bound, then the current value of primitiveTopology must be VK_PRIMITIVE_TOPOLOGY_PATCH_LIST prior to this drawing command", 176}, { "chapters/drawing.html", 21} } },
@@ -11324,8 +11335,8 @@
         { {"VUID-vkCmdDrawClusterHUAWEI-None-07639", 38}, { {"If the depthClipControl feature is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE_EXT dynamic state enabled, then vkCmdSetDepthClipNegativeOneToOneEXT must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 385}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterHUAWEI-None-07640", 38}, { {"If the VK_NV_clip_space_w_scaling extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_ENABLE_NV dynamic state enabled, then vkCmdSetViewportWScalingEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 387}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterHUAWEI-None-07641", 38}, { {"If the VK_NV_viewport_swizzle extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_SWIZZLE_NV dynamic state enabled, then vkCmdSetViewportSwizzleNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 367}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawClusterHUAWEI-None-07642", 38}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 469}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawClusterHUAWEI-None-07643", 38}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 528}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawClusterHUAWEI-None-07642", 38}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawClusterHUAWEI-None-07643", 38}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 508}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterHUAWEI-None-07644", 38}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_MODE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageModulationModeNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterHUAWEI-None-07645", 38}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_ENABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationMode is any value other than VK_COVERAGE_MODULATION_MODE_NONE_NV, then vkCmdSetCoverageModulationTableEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 569}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterHUAWEI-None-07646", 38}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationTableEnable is VK_TRUE, then vkCmdSetCoverageModulationTableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 514}, { "chapters/drawing.html", 21} } },
@@ -11491,6 +11502,7 @@
         { {"VUID-vkCmdDrawClusterHUAWEI-groupCountX-07820", 45}, { {"groupCountX must be less than or equal to VkPhysicalDeviceClusterCullingShaderPropertiesHUAWEI::maxWorkGroupCount[0]", 116}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterHUAWEI-groupCountY-07821", 45}, { {"groupCountY must be less than or equal to VkPhysicalDeviceClusterCullingShaderPropertiesHUAWEI::maxWorkGroupCount[1]", 116}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterHUAWEI-groupCountZ-07822", 45}, { {"groupCountZ must be less than or equal to VkPhysicalDeviceClusterCullingShaderPropertiesHUAWEI::maxWorkGroupCount[2]", 116}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawClusterHUAWEI-imageLayout-00344", 45}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterHUAWEI-imageView-06172", 43}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the depth attachment", 292}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterHUAWEI-imageView-06173", 43}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pStencilAttachment is not VK_NULL_HANDLE, and the layout member of pStencilAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the stencil attachment", 298}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterHUAWEI-imageView-06174", 43}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, this command must not write any values to the depth attachment", 303}, { "chapters/drawing.html", 21} } },
@@ -11526,7 +11538,7 @@
         { {"VUID-vkCmdDrawClusterHUAWEI-pStages-10680", 41}, { {"If there is no bound graphics pipeline, vkCmdBindShadersEXT must not have last bound the pStages element of VK_SHADER_STAGE_VERTEX_BIT, VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT, VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT or VK_SHADER_STAGE_GEOMETRY_BIT with a valid shader object other than VK_NULL_HANDLE", 306}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterHUAWEI-pStencilAttachment-06187", 52}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the bound pipeline was created with a VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV structure, and VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, the value of the depthStencilAttachmentSamples member of VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV used to create the bound graphics pipeline must be equal to the sample count used to create VkRenderingInfo::pStencilAttachment->imageView", 519}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterHUAWEI-pStencilAttachment-08965", 52}, { {"If the current render pass instance was begun with vkCmdBeginRendering, there is a graphics pipeline bound, stencil test is enabled and the VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, then the VkPipelineRenderingCreateInfo::stencilAttachmentFormat used to create the pipeline must not be VK_FORMAT_UNDEFINED", 334}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawClusterHUAWEI-pipelineFragmentShadingRate-09238", 61}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 459}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawClusterHUAWEI-pipelineFragmentShadingRate-09238", 61}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 439}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterHUAWEI-pipelineStatistics-07076", 52}, { {"The pipelineStatistics member used to create any active Pipeline Statistics Query must not contain VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_VERTICES_BIT, VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_VERTEX_SHADER_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_CLIPPING_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_CLIPPING_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_CONTROL_SHADER_PATCHES_BIT, or VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_EVALUATION_SHADER_INVOCATIONS_BIT", 648}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterHUAWEI-primitiveFragmentShadingRateWithMultipleViewports-04552", 83}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT dynamic state enabled, and any of the shader stages of the bound graphics pipeline write to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 481}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterHUAWEI-primitiveFragmentShadingRateWithMultipleViewports-08642", 83}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, and any shader object bound to a graphics stage writes to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 361}, { "chapters/drawing.html", 21} } },
@@ -11619,8 +11631,8 @@
         { {"VUID-vkCmdDrawClusterIndirectHUAWEI-None-07639", 46}, { {"If the depthClipControl feature is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE_EXT dynamic state enabled, then vkCmdSetDepthClipNegativeOneToOneEXT must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 385}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterIndirectHUAWEI-None-07640", 46}, { {"If the VK_NV_clip_space_w_scaling extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_ENABLE_NV dynamic state enabled, then vkCmdSetViewportWScalingEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 387}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterIndirectHUAWEI-None-07641", 46}, { {"If the VK_NV_viewport_swizzle extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_SWIZZLE_NV dynamic state enabled, then vkCmdSetViewportSwizzleNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 367}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawClusterIndirectHUAWEI-None-07642", 46}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 469}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawClusterIndirectHUAWEI-None-07643", 46}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 528}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawClusterIndirectHUAWEI-None-07642", 46}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawClusterIndirectHUAWEI-None-07643", 46}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 508}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterIndirectHUAWEI-None-07644", 46}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_MODE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageModulationModeNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterIndirectHUAWEI-None-07645", 46}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_ENABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationMode is any value other than VK_COVERAGE_MODULATION_MODE_NONE_NV, then vkCmdSetCoverageModulationTableEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 569}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterIndirectHUAWEI-None-07646", 46}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationTableEnable is VK_TRUE, then vkCmdSetCoverageModulationTableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 514}, { "chapters/drawing.html", 21} } },
@@ -11786,6 +11798,7 @@
         { {"VUID-vkCmdDrawClusterIndirectHUAWEI-flags-02696", 47}, { {"Any VkImage created with a VkImageCreateInfo::flags containing VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV sampled as a result of this command must only be sampled using a VkSamplerAddressMode of VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE", 227}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterIndirectHUAWEI-flags-10582", 47}, { {"If the current render pass instance was begun with a vkCmdBeginRendering call in commandBuffer, its VkRenderingInfo::flags parameter must not have VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT set unless VK_RENDERING_CONTENTS_INLINE_BIT_KHR is also set", 258}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterIndirectHUAWEI-format-07753", 48}, { {"If a VkImageView or VkBufferView is accessed as a result of this command, then the numeric type of the view's format and the Sampled Type operand of the OpTypeImage must match", 175}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawClusterIndirectHUAWEI-imageLayout-00344", 53}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterIndirectHUAWEI-imageView-06172", 51}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the depth attachment", 292}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterIndirectHUAWEI-imageView-06173", 51}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pStencilAttachment is not VK_NULL_HANDLE, and the layout member of pStencilAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the stencil attachment", 298}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterIndirectHUAWEI-imageView-06174", 51}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, this command must not write any values to the depth attachment", 303}, { "chapters/drawing.html", 21} } },
@@ -11822,7 +11835,7 @@
         { {"VUID-vkCmdDrawClusterIndirectHUAWEI-pStages-10680", 49}, { {"If there is no bound graphics pipeline, vkCmdBindShadersEXT must not have last bound the pStages element of VK_SHADER_STAGE_VERTEX_BIT, VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT, VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT or VK_SHADER_STAGE_GEOMETRY_BIT with a valid shader object other than VK_NULL_HANDLE", 306}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterIndirectHUAWEI-pStencilAttachment-06187", 60}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the bound pipeline was created with a VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV structure, and VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, the value of the depthStencilAttachmentSamples member of VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV used to create the bound graphics pipeline must be equal to the sample count used to create VkRenderingInfo::pStencilAttachment->imageView", 519}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterIndirectHUAWEI-pStencilAttachment-08965", 60}, { {"If the current render pass instance was begun with vkCmdBeginRendering, there is a graphics pipeline bound, stencil test is enabled and the VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, then the VkPipelineRenderingCreateInfo::stencilAttachmentFormat used to create the pipeline must not be VK_FORMAT_UNDEFINED", 334}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawClusterIndirectHUAWEI-pipelineFragmentShadingRate-09238", 69}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 459}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawClusterIndirectHUAWEI-pipelineFragmentShadingRate-09238", 69}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 439}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterIndirectHUAWEI-pipelineStatistics-07076", 60}, { {"The pipelineStatistics member used to create any active Pipeline Statistics Query must not contain VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_VERTICES_BIT, VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_VERTEX_SHADER_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_CLIPPING_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_CLIPPING_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_CONTROL_SHADER_PATCHES_BIT, or VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_EVALUATION_SHADER_INVOCATIONS_BIT", 648}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterIndirectHUAWEI-primitiveFragmentShadingRateWithMultipleViewports-04552", 91}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT dynamic state enabled, and any of the shader stages of the bound graphics pipeline write to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 481}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawClusterIndirectHUAWEI-primitiveFragmentShadingRateWithMultipleViewports-08642", 91}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, and any shader object bound to a graphics stage writes to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 361}, { "chapters/drawing.html", 21} } },
@@ -11922,8 +11935,8 @@
         { {"VUID-vkCmdDrawIndexed-None-07639", 32}, { {"If the depthClipControl feature is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE_EXT dynamic state enabled, then vkCmdSetDepthClipNegativeOneToOneEXT must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 385}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexed-None-07640", 32}, { {"If the VK_NV_clip_space_w_scaling extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_ENABLE_NV dynamic state enabled, then vkCmdSetViewportWScalingEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 387}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexed-None-07641", 32}, { {"If the VK_NV_viewport_swizzle extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_SWIZZLE_NV dynamic state enabled, then vkCmdSetViewportSwizzleNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 367}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawIndexed-None-07642", 32}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 469}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawIndexed-None-07643", 32}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 528}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndexed-None-07642", 32}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndexed-None-07643", 32}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 508}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexed-None-07644", 32}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_MODE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageModulationModeNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexed-None-07645", 32}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_ENABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationMode is any value other than VK_COVERAGE_MODULATION_MODE_NONE_NV, then vkCmdSetCoverageModulationTableEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 569}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexed-None-07646", 32}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationTableEnable is VK_TRUE, then vkCmdSetCoverageModulationTableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 514}, { "chapters/drawing.html", 21} } },
@@ -12097,6 +12110,7 @@
         { {"VUID-vkCmdDrawIndexed-format-08937", 34}, { {"If there is a shader object bound to the VK_SHADER_STAGE_VERTEX_BIT stage or the bound graphics pipeline state was created with the VK_DYNAMIC_STATE_VERTEX_INPUT_EXT dynamic state enabled and the scalar width associated with a Location decorated Input variable in the Vertex Execution Model OpEntryPoint is 64-bit, then the corresponding VkVertexInputAttributeDescription2EXT::format must have a 64-bit component", 412}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexed-format-10389", 34}, { {"For each vertex attribute accessed by this command, if its VkVertexInputAttributeDescription::format or VkVertexInputAttributeDescription2EXT::format is a packed format, and the legacyVertexAttributes feature is not enabled, the value of attribAddress, calculated as described in Vertex Input Calculation, must be a multiple of the size of the format", 350}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexed-format-10390", 34}, { {"For each vertex attribute accessed by this command, if its VkVertexInputAttributeDescription::format or VkVertexInputAttributeDescription2EXT::format is not a packed format, and either the legacyVertexAttributes feature is not enabled or format has 64-bit components, the value of attribAddress, calculated as described in Vertex Input Calculation, must be a multiple of the component size of the format", 403}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndexed-imageLayout-00344", 39}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexed-imageView-06172", 37}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the depth attachment", 292}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexed-imageView-06173", 37}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pStencilAttachment is not VK_NULL_HANDLE, and the layout member of pStencilAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the stencil attachment", 298}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexed-imageView-06174", 37}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, this command must not write any values to the depth attachment", 303}, { "chapters/drawing.html", 21} } },
@@ -12133,7 +12147,7 @@
         { {"VUID-vkCmdDrawIndexed-pStencilAttachment-06187", 46}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the bound pipeline was created with a VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV structure, and VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, the value of the depthStencilAttachmentSamples member of VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV used to create the bound graphics pipeline must be equal to the sample count used to create VkRenderingInfo::pStencilAttachment->imageView", 519}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexed-pStencilAttachment-08965", 46}, { {"If the current render pass instance was begun with vkCmdBeginRendering, there is a graphics pipeline bound, stencil test is enabled and the VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, then the VkPipelineRenderingCreateInfo::stencilAttachmentFormat used to create the pipeline must not be VK_FORMAT_UNDEFINED", 334}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexed-pStrides-04913", 36}, { {"If the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE dynamic state enabled, but without the VK_DYNAMIC_STATE_VERTEX_INPUT_EXT dynamic state enabled, then vkCmdBindVertexBuffers2 must have been called and not subsequently invalidated in the current command buffer prior to this draw command, and the pStrides parameter of vkCmdBindVertexBuffers2 must not be NULL", 405}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawIndexed-pipelineFragmentShadingRate-09238", 55}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 459}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndexed-pipelineFragmentShadingRate-09238", 55}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 439}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexed-primitiveFragmentShadingRateWithMultipleViewports-04552", 77}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT dynamic state enabled, and any of the shader stages of the bound graphics pipeline write to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 481}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexed-primitiveFragmentShadingRateWithMultipleViewports-08642", 77}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, and any shader object bound to a graphics stage writes to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 361}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexed-primitiveTopology-10286", 45}, { {"If a VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT stage is bound, then the current value of primitiveTopology must be VK_PRIMITIVE_TOPOLOGY_PATCH_LIST prior to this drawing command", 176}, { "chapters/drawing.html", 21} } },
@@ -12236,8 +12250,8 @@
         { {"VUID-vkCmdDrawIndexedIndirect-None-07639", 40}, { {"If the depthClipControl feature is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE_EXT dynamic state enabled, then vkCmdSetDepthClipNegativeOneToOneEXT must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 385}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirect-None-07640", 40}, { {"If the VK_NV_clip_space_w_scaling extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_ENABLE_NV dynamic state enabled, then vkCmdSetViewportWScalingEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 387}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirect-None-07641", 40}, { {"If the VK_NV_viewport_swizzle extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_SWIZZLE_NV dynamic state enabled, then vkCmdSetViewportSwizzleNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 367}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawIndexedIndirect-None-07642", 40}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 469}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawIndexedIndirect-None-07643", 40}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 528}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndexedIndirect-None-07642", 40}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndexedIndirect-None-07643", 40}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 508}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirect-None-07644", 40}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_MODE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageModulationModeNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirect-None-07645", 40}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_ENABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationMode is any value other than VK_COVERAGE_MODULATION_MODE_NONE_NV, then vkCmdSetCoverageModulationTableEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 569}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirect-None-07646", 40}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationTableEnable is VK_TRUE, then vkCmdSetCoverageModulationTableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 514}, { "chapters/drawing.html", 21} } },
@@ -12417,6 +12431,7 @@
         { {"VUID-vkCmdDrawIndexedIndirect-format-08937", 42}, { {"If there is a shader object bound to the VK_SHADER_STAGE_VERTEX_BIT stage or the bound graphics pipeline state was created with the VK_DYNAMIC_STATE_VERTEX_INPUT_EXT dynamic state enabled and the scalar width associated with a Location decorated Input variable in the Vertex Execution Model OpEntryPoint is 64-bit, then the corresponding VkVertexInputAttributeDescription2EXT::format must have a 64-bit component", 412}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirect-format-10389", 42}, { {"For each vertex attribute accessed by this command, if its VkVertexInputAttributeDescription::format or VkVertexInputAttributeDescription2EXT::format is a packed format, and the legacyVertexAttributes feature is not enabled, the value of attribAddress, calculated as described in Vertex Input Calculation, must be a multiple of the size of the format", 350}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirect-format-10390", 42}, { {"For each vertex attribute accessed by this command, if its VkVertexInputAttributeDescription::format or VkVertexInputAttributeDescription2EXT::format is not a packed format, and either the legacyVertexAttributes feature is not enabled or format has 64-bit components, the value of attribAddress, calculated as described in Vertex Input Calculation, must be a multiple of the component size of the format", 403}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndexedIndirect-imageLayout-00344", 47}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirect-imageView-06172", 45}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the depth attachment", 292}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirect-imageView-06173", 45}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pStencilAttachment is not VK_NULL_HANDLE, and the layout member of pStencilAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the stencil attachment", 298}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirect-imageView-06174", 45}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, this command must not write any values to the depth attachment", 303}, { "chapters/drawing.html", 21} } },
@@ -12453,7 +12468,7 @@
         { {"VUID-vkCmdDrawIndexedIndirect-pStencilAttachment-06187", 54}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the bound pipeline was created with a VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV structure, and VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, the value of the depthStencilAttachmentSamples member of VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV used to create the bound graphics pipeline must be equal to the sample count used to create VkRenderingInfo::pStencilAttachment->imageView", 519}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirect-pStencilAttachment-08965", 54}, { {"If the current render pass instance was begun with vkCmdBeginRendering, there is a graphics pipeline bound, stencil test is enabled and the VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, then the VkPipelineRenderingCreateInfo::stencilAttachmentFormat used to create the pipeline must not be VK_FORMAT_UNDEFINED", 334}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirect-pStrides-04913", 44}, { {"If the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE dynamic state enabled, but without the VK_DYNAMIC_STATE_VERTEX_INPUT_EXT dynamic state enabled, then vkCmdBindVertexBuffers2 must have been called and not subsequently invalidated in the current command buffer prior to this draw command, and the pStrides parameter of vkCmdBindVertexBuffers2 must not be NULL", 405}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawIndexedIndirect-pipelineFragmentShadingRate-09238", 63}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 459}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndexedIndirect-pipelineFragmentShadingRate-09238", 63}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 439}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirect-primitiveFragmentShadingRateWithMultipleViewports-04552", 85}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT dynamic state enabled, and any of the shader stages of the bound graphics pipeline write to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 481}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirect-primitiveFragmentShadingRateWithMultipleViewports-08642", 85}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, and any shader object bound to a graphics stage writes to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 361}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirect-primitiveTopology-10286", 53}, { {"If a VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT stage is bound, then the current value of primitiveTopology must be VK_PRIMITIVE_TOPOLOGY_PATCH_LIST prior to this drawing command", 176}, { "chapters/drawing.html", 21} } },
@@ -12556,8 +12571,8 @@
         { {"VUID-vkCmdDrawIndexedIndirectCount-None-07639", 45}, { {"If the depthClipControl feature is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE_EXT dynamic state enabled, then vkCmdSetDepthClipNegativeOneToOneEXT must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 385}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirectCount-None-07640", 45}, { {"If the VK_NV_clip_space_w_scaling extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_ENABLE_NV dynamic state enabled, then vkCmdSetViewportWScalingEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 387}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirectCount-None-07641", 45}, { {"If the VK_NV_viewport_swizzle extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_SWIZZLE_NV dynamic state enabled, then vkCmdSetViewportSwizzleNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 367}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawIndexedIndirectCount-None-07642", 45}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 469}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawIndexedIndirectCount-None-07643", 45}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 528}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndexedIndirectCount-None-07642", 45}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndexedIndirectCount-None-07643", 45}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 508}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirectCount-None-07644", 45}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_MODE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageModulationModeNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirectCount-None-07645", 45}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_ENABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationMode is any value other than VK_COVERAGE_MODULATION_MODE_NONE_NV, then vkCmdSetCoverageModulationTableEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 569}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirectCount-None-07646", 45}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationTableEnable is VK_TRUE, then vkCmdSetCoverageModulationTableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 514}, { "chapters/drawing.html", 21} } },
@@ -12738,6 +12753,7 @@
         { {"VUID-vkCmdDrawIndexedIndirectCount-format-08937", 47}, { {"If there is a shader object bound to the VK_SHADER_STAGE_VERTEX_BIT stage or the bound graphics pipeline state was created with the VK_DYNAMIC_STATE_VERTEX_INPUT_EXT dynamic state enabled and the scalar width associated with a Location decorated Input variable in the Vertex Execution Model OpEntryPoint is 64-bit, then the corresponding VkVertexInputAttributeDescription2EXT::format must have a 64-bit component", 412}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirectCount-format-10389", 47}, { {"For each vertex attribute accessed by this command, if its VkVertexInputAttributeDescription::format or VkVertexInputAttributeDescription2EXT::format is a packed format, and the legacyVertexAttributes feature is not enabled, the value of attribAddress, calculated as described in Vertex Input Calculation, must be a multiple of the size of the format", 350}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirectCount-format-10390", 47}, { {"For each vertex attribute accessed by this command, if its VkVertexInputAttributeDescription::format or VkVertexInputAttributeDescription2EXT::format is not a packed format, and either the legacyVertexAttributes feature is not enabled or format has 64-bit components, the value of attribAddress, calculated as described in Vertex Input Calculation, must be a multiple of the component size of the format", 403}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndexedIndirectCount-imageLayout-00344", 52}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirectCount-imageView-06172", 50}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the depth attachment", 292}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirectCount-imageView-06173", 50}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pStencilAttachment is not VK_NULL_HANDLE, and the layout member of pStencilAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the stencil attachment", 298}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirectCount-imageView-06174", 50}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, this command must not write any values to the depth attachment", 303}, { "chapters/drawing.html", 21} } },
@@ -12775,7 +12791,7 @@
         { {"VUID-vkCmdDrawIndexedIndirectCount-pStencilAttachment-06187", 59}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the bound pipeline was created with a VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV structure, and VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, the value of the depthStencilAttachmentSamples member of VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV used to create the bound graphics pipeline must be equal to the sample count used to create VkRenderingInfo::pStencilAttachment->imageView", 519}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirectCount-pStencilAttachment-08965", 59}, { {"If the current render pass instance was begun with vkCmdBeginRendering, there is a graphics pipeline bound, stencil test is enabled and the VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, then the VkPipelineRenderingCreateInfo::stencilAttachmentFormat used to create the pipeline must not be VK_FORMAT_UNDEFINED", 334}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirectCount-pStrides-04913", 49}, { {"If the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE dynamic state enabled, but without the VK_DYNAMIC_STATE_VERTEX_INPUT_EXT dynamic state enabled, then vkCmdBindVertexBuffers2 must have been called and not subsequently invalidated in the current command buffer prior to this draw command, and the pStrides parameter of vkCmdBindVertexBuffers2 must not be NULL", 405}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawIndexedIndirectCount-pipelineFragmentShadingRate-09238", 68}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 459}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndexedIndirectCount-pipelineFragmentShadingRate-09238", 68}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 439}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirectCount-primitiveFragmentShadingRateWithMultipleViewports-04552", 90}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT dynamic state enabled, and any of the shader stages of the bound graphics pipeline write to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 481}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirectCount-primitiveFragmentShadingRateWithMultipleViewports-08642", 90}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, and any shader object bound to a graphics stage writes to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 361}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndexedIndirectCount-primitiveTopology-10286", 58}, { {"If a VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT stage is bound, then the current value of primitiveTopology must be VK_PRIMITIVE_TOPOLOGY_PATCH_LIST prior to this drawing command", 176}, { "chapters/drawing.html", 21} } },
@@ -12877,8 +12893,8 @@
         { {"VUID-vkCmdDrawIndirect-None-07639", 33}, { {"If the depthClipControl feature is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE_EXT dynamic state enabled, then vkCmdSetDepthClipNegativeOneToOneEXT must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 385}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirect-None-07640", 33}, { {"If the VK_NV_clip_space_w_scaling extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_ENABLE_NV dynamic state enabled, then vkCmdSetViewportWScalingEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 387}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirect-None-07641", 33}, { {"If the VK_NV_viewport_swizzle extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_SWIZZLE_NV dynamic state enabled, then vkCmdSetViewportSwizzleNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 367}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawIndirect-None-07642", 33}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 469}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawIndirect-None-07643", 33}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 528}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndirect-None-07642", 33}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndirect-None-07643", 33}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 508}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirect-None-07644", 33}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_MODE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageModulationModeNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirect-None-07645", 33}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_ENABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationMode is any value other than VK_COVERAGE_MODULATION_MODE_NONE_NV, then vkCmdSetCoverageModulationTableEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 569}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirect-None-07646", 33}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationTableEnable is VK_TRUE, then vkCmdSetCoverageModulationTableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 514}, { "chapters/drawing.html", 21} } },
@@ -13058,6 +13074,7 @@
         { {"VUID-vkCmdDrawIndirect-format-08937", 35}, { {"If there is a shader object bound to the VK_SHADER_STAGE_VERTEX_BIT stage or the bound graphics pipeline state was created with the VK_DYNAMIC_STATE_VERTEX_INPUT_EXT dynamic state enabled and the scalar width associated with a Location decorated Input variable in the Vertex Execution Model OpEntryPoint is 64-bit, then the corresponding VkVertexInputAttributeDescription2EXT::format must have a 64-bit component", 412}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirect-format-10389", 35}, { {"For each vertex attribute accessed by this command, if its VkVertexInputAttributeDescription::format or VkVertexInputAttributeDescription2EXT::format is a packed format, and the legacyVertexAttributes feature is not enabled, the value of attribAddress, calculated as described in Vertex Input Calculation, must be a multiple of the size of the format", 350}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirect-format-10390", 35}, { {"For each vertex attribute accessed by this command, if its VkVertexInputAttributeDescription::format or VkVertexInputAttributeDescription2EXT::format is not a packed format, and either the legacyVertexAttributes feature is not enabled or format has 64-bit components, the value of attribAddress, calculated as described in Vertex Input Calculation, must be a multiple of the component size of the format", 403}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndirect-imageLayout-00344", 40}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirect-imageView-06172", 38}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the depth attachment", 292}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirect-imageView-06173", 38}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pStencilAttachment is not VK_NULL_HANDLE, and the layout member of pStencilAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the stencil attachment", 298}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirect-imageView-06174", 38}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, this command must not write any values to the depth attachment", 303}, { "chapters/drawing.html", 21} } },
@@ -13094,7 +13111,7 @@
         { {"VUID-vkCmdDrawIndirect-pStencilAttachment-06187", 47}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the bound pipeline was created with a VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV structure, and VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, the value of the depthStencilAttachmentSamples member of VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV used to create the bound graphics pipeline must be equal to the sample count used to create VkRenderingInfo::pStencilAttachment->imageView", 519}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirect-pStencilAttachment-08965", 47}, { {"If the current render pass instance was begun with vkCmdBeginRendering, there is a graphics pipeline bound, stencil test is enabled and the VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, then the VkPipelineRenderingCreateInfo::stencilAttachmentFormat used to create the pipeline must not be VK_FORMAT_UNDEFINED", 334}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirect-pStrides-04913", 37}, { {"If the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE dynamic state enabled, but without the VK_DYNAMIC_STATE_VERTEX_INPUT_EXT dynamic state enabled, then vkCmdBindVertexBuffers2 must have been called and not subsequently invalidated in the current command buffer prior to this draw command, and the pStrides parameter of vkCmdBindVertexBuffers2 must not be NULL", 405}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawIndirect-pipelineFragmentShadingRate-09238", 56}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 459}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndirect-pipelineFragmentShadingRate-09238", 56}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 439}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirect-primitiveFragmentShadingRateWithMultipleViewports-04552", 78}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT dynamic state enabled, and any of the shader stages of the bound graphics pipeline write to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 481}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirect-primitiveFragmentShadingRateWithMultipleViewports-08642", 78}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, and any shader object bound to a graphics stage writes to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 361}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirect-primitiveTopology-10286", 46}, { {"If a VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT stage is bound, then the current value of primitiveTopology must be VK_PRIMITIVE_TOPOLOGY_PATCH_LIST prior to this drawing command", 176}, { "chapters/drawing.html", 21} } },
@@ -13195,8 +13212,8 @@
         { {"VUID-vkCmdDrawIndirectByteCountEXT-None-07639", 45}, { {"If the depthClipControl feature is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE_EXT dynamic state enabled, then vkCmdSetDepthClipNegativeOneToOneEXT must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 385}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectByteCountEXT-None-07640", 45}, { {"If the VK_NV_clip_space_w_scaling extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_ENABLE_NV dynamic state enabled, then vkCmdSetViewportWScalingEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 387}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectByteCountEXT-None-07641", 45}, { {"If the VK_NV_viewport_swizzle extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_SWIZZLE_NV dynamic state enabled, then vkCmdSetViewportSwizzleNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 367}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawIndirectByteCountEXT-None-07642", 45}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 469}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawIndirectByteCountEXT-None-07643", 45}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 528}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndirectByteCountEXT-None-07642", 45}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndirectByteCountEXT-None-07643", 45}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 508}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectByteCountEXT-None-07644", 45}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_MODE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageModulationModeNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectByteCountEXT-None-07645", 45}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_ENABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationMode is any value other than VK_COVERAGE_MODULATION_MODE_NONE_NV, then vkCmdSetCoverageModulationTableEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 569}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectByteCountEXT-None-07646", 45}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationTableEnable is VK_TRUE, then vkCmdSetCoverageModulationTableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 514}, { "chapters/drawing.html", 21} } },
@@ -13374,6 +13391,7 @@
         { {"VUID-vkCmdDrawIndirectByteCountEXT-format-08937", 47}, { {"If there is a shader object bound to the VK_SHADER_STAGE_VERTEX_BIT stage or the bound graphics pipeline state was created with the VK_DYNAMIC_STATE_VERTEX_INPUT_EXT dynamic state enabled and the scalar width associated with a Location decorated Input variable in the Vertex Execution Model OpEntryPoint is 64-bit, then the corresponding VkVertexInputAttributeDescription2EXT::format must have a 64-bit component", 412}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectByteCountEXT-format-10389", 47}, { {"For each vertex attribute accessed by this command, if its VkVertexInputAttributeDescription::format or VkVertexInputAttributeDescription2EXT::format is a packed format, and the legacyVertexAttributes feature is not enabled, the value of attribAddress, calculated as described in Vertex Input Calculation, must be a multiple of the size of the format", 350}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectByteCountEXT-format-10390", 47}, { {"For each vertex attribute accessed by this command, if its VkVertexInputAttributeDescription::format or VkVertexInputAttributeDescription2EXT::format is not a packed format, and either the legacyVertexAttributes feature is not enabled or format has 64-bit components, the value of attribAddress, calculated as described in Vertex Input Calculation, must be a multiple of the component size of the format", 403}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndirectByteCountEXT-imageLayout-00344", 52}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectByteCountEXT-imageView-06172", 50}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the depth attachment", 292}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectByteCountEXT-imageView-06173", 50}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pStencilAttachment is not VK_NULL_HANDLE, and the layout member of pStencilAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the stencil attachment", 298}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectByteCountEXT-imageView-06174", 50}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, this command must not write any values to the depth attachment", 303}, { "chapters/drawing.html", 21} } },
@@ -13410,7 +13428,7 @@
         { {"VUID-vkCmdDrawIndirectByteCountEXT-pStencilAttachment-06187", 59}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the bound pipeline was created with a VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV structure, and VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, the value of the depthStencilAttachmentSamples member of VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV used to create the bound graphics pipeline must be equal to the sample count used to create VkRenderingInfo::pStencilAttachment->imageView", 519}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectByteCountEXT-pStencilAttachment-08965", 59}, { {"If the current render pass instance was begun with vkCmdBeginRendering, there is a graphics pipeline bound, stencil test is enabled and the VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, then the VkPipelineRenderingCreateInfo::stencilAttachmentFormat used to create the pipeline must not be VK_FORMAT_UNDEFINED", 334}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectByteCountEXT-pStrides-04913", 49}, { {"If the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE dynamic state enabled, but without the VK_DYNAMIC_STATE_VERTEX_INPUT_EXT dynamic state enabled, then vkCmdBindVertexBuffers2 must have been called and not subsequently invalidated in the current command buffer prior to this draw command, and the pStrides parameter of vkCmdBindVertexBuffers2 must not be NULL", 405}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawIndirectByteCountEXT-pipelineFragmentShadingRate-09238", 68}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 459}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndirectByteCountEXT-pipelineFragmentShadingRate-09238", 68}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 439}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectByteCountEXT-primitiveFragmentShadingRateWithMultipleViewports-04552", 90}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT dynamic state enabled, and any of the shader stages of the bound graphics pipeline write to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 481}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectByteCountEXT-primitiveFragmentShadingRateWithMultipleViewports-08642", 90}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, and any shader object bound to a graphics stage writes to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 361}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectByteCountEXT-primitiveTopology-10286", 58}, { {"If a VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT stage is bound, then the current value of primitiveTopology must be VK_PRIMITIVE_TOPOLOGY_PATCH_LIST prior to this drawing command", 176}, { "chapters/drawing.html", 21} } },
@@ -13516,8 +13534,8 @@
         { {"VUID-vkCmdDrawIndirectCount-None-07639", 38}, { {"If the depthClipControl feature is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE_EXT dynamic state enabled, then vkCmdSetDepthClipNegativeOneToOneEXT must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 385}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectCount-None-07640", 38}, { {"If the VK_NV_clip_space_w_scaling extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_ENABLE_NV dynamic state enabled, then vkCmdSetViewportWScalingEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 387}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectCount-None-07641", 38}, { {"If the VK_NV_viewport_swizzle extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_SWIZZLE_NV dynamic state enabled, then vkCmdSetViewportSwizzleNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 367}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawIndirectCount-None-07642", 38}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 469}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawIndirectCount-None-07643", 38}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 528}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndirectCount-None-07642", 38}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndirectCount-None-07643", 38}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 508}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectCount-None-07644", 38}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_MODE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageModulationModeNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectCount-None-07645", 38}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_ENABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationMode is any value other than VK_COVERAGE_MODULATION_MODE_NONE_NV, then vkCmdSetCoverageModulationTableEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 569}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectCount-None-07646", 38}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationTableEnable is VK_TRUE, then vkCmdSetCoverageModulationTableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 514}, { "chapters/drawing.html", 21} } },
@@ -13698,6 +13716,7 @@
         { {"VUID-vkCmdDrawIndirectCount-format-08937", 40}, { {"If there is a shader object bound to the VK_SHADER_STAGE_VERTEX_BIT stage or the bound graphics pipeline state was created with the VK_DYNAMIC_STATE_VERTEX_INPUT_EXT dynamic state enabled and the scalar width associated with a Location decorated Input variable in the Vertex Execution Model OpEntryPoint is 64-bit, then the corresponding VkVertexInputAttributeDescription2EXT::format must have a 64-bit component", 412}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectCount-format-10389", 40}, { {"For each vertex attribute accessed by this command, if its VkVertexInputAttributeDescription::format or VkVertexInputAttributeDescription2EXT::format is a packed format, and the legacyVertexAttributes feature is not enabled, the value of attribAddress, calculated as described in Vertex Input Calculation, must be a multiple of the size of the format", 350}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectCount-format-10390", 40}, { {"For each vertex attribute accessed by this command, if its VkVertexInputAttributeDescription::format or VkVertexInputAttributeDescription2EXT::format is not a packed format, and either the legacyVertexAttributes feature is not enabled or format has 64-bit components, the value of attribAddress, calculated as described in Vertex Input Calculation, must be a multiple of the component size of the format", 403}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndirectCount-imageLayout-00344", 45}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectCount-imageView-06172", 43}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the depth attachment", 292}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectCount-imageView-06173", 43}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pStencilAttachment is not VK_NULL_HANDLE, and the layout member of pStencilAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the stencil attachment", 298}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectCount-imageView-06174", 43}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, this command must not write any values to the depth attachment", 303}, { "chapters/drawing.html", 21} } },
@@ -13735,7 +13754,7 @@
         { {"VUID-vkCmdDrawIndirectCount-pStencilAttachment-06187", 52}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the bound pipeline was created with a VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV structure, and VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, the value of the depthStencilAttachmentSamples member of VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV used to create the bound graphics pipeline must be equal to the sample count used to create VkRenderingInfo::pStencilAttachment->imageView", 519}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectCount-pStencilAttachment-08965", 52}, { {"If the current render pass instance was begun with vkCmdBeginRendering, there is a graphics pipeline bound, stencil test is enabled and the VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, then the VkPipelineRenderingCreateInfo::stencilAttachmentFormat used to create the pipeline must not be VK_FORMAT_UNDEFINED", 334}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectCount-pStrides-04913", 42}, { {"If the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE dynamic state enabled, but without the VK_DYNAMIC_STATE_VERTEX_INPUT_EXT dynamic state enabled, then vkCmdBindVertexBuffers2 must have been called and not subsequently invalidated in the current command buffer prior to this draw command, and the pStrides parameter of vkCmdBindVertexBuffers2 must not be NULL", 405}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawIndirectCount-pipelineFragmentShadingRate-09238", 61}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 459}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawIndirectCount-pipelineFragmentShadingRate-09238", 61}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 439}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectCount-primitiveFragmentShadingRateWithMultipleViewports-04552", 83}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT dynamic state enabled, and any of the shader stages of the bound graphics pipeline write to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 481}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectCount-primitiveFragmentShadingRateWithMultipleViewports-08642", 83}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, and any shader object bound to a graphics stage writes to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 361}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawIndirectCount-primitiveTopology-10286", 51}, { {"If a VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT stage is bound, then the current value of primitiveTopology must be VK_PRIMITIVE_TOPOLOGY_PATCH_LIST prior to this drawing command", 176}, { "chapters/drawing.html", 21} } },
@@ -13831,8 +13850,8 @@
         { {"VUID-vkCmdDrawMeshTasksEXT-None-07639", 37}, { {"If the depthClipControl feature is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE_EXT dynamic state enabled, then vkCmdSetDepthClipNegativeOneToOneEXT must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 385}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksEXT-None-07640", 37}, { {"If the VK_NV_clip_space_w_scaling extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_ENABLE_NV dynamic state enabled, then vkCmdSetViewportWScalingEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 387}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksEXT-None-07641", 37}, { {"If the VK_NV_viewport_swizzle extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_SWIZZLE_NV dynamic state enabled, then vkCmdSetViewportSwizzleNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 367}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMeshTasksEXT-None-07642", 37}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 469}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMeshTasksEXT-None-07643", 37}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 528}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksEXT-None-07642", 37}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksEXT-None-07643", 37}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 508}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksEXT-None-07644", 37}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_MODE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageModulationModeNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksEXT-None-07645", 37}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_ENABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationMode is any value other than VK_COVERAGE_MODULATION_MODE_NONE_NV, then vkCmdSetCoverageModulationTableEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 569}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksEXT-None-07646", 37}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationTableEnable is VK_TRUE, then vkCmdSetCoverageModulationTableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 514}, { "chapters/drawing.html", 21} } },
@@ -14002,6 +14021,7 @@
         { {"VUID-vkCmdDrawMeshTasksEXT-flags-02696", 38}, { {"Any VkImage created with a VkImageCreateInfo::flags containing VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV sampled as a result of this command must only be sampled using a VkSamplerAddressMode of VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE", 227}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksEXT-flags-10582", 38}, { {"If the current render pass instance was begun with a vkCmdBeginRendering call in commandBuffer, its VkRenderingInfo::flags parameter must not have VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT set unless VK_RENDERING_CONTENTS_INLINE_BIT_KHR is also set", 258}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksEXT-format-07753", 39}, { {"If a VkImageView or VkBufferView is accessed as a result of this command, then the numeric type of the view's format and the Sampled Type operand of the OpTypeImage must match", 175}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksEXT-imageLayout-00344", 44}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksEXT-imageView-06172", 42}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the depth attachment", 292}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksEXT-imageView-06173", 42}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pStencilAttachment is not VK_NULL_HANDLE, and the layout member of pStencilAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the stencil attachment", 298}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksEXT-imageView-06174", 42}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, this command must not write any values to the depth attachment", 303}, { "chapters/drawing.html", 21} } },
@@ -14037,7 +14057,7 @@
         { {"VUID-vkCmdDrawMeshTasksEXT-pStages-10680", 40}, { {"If there is no bound graphics pipeline, vkCmdBindShadersEXT must not have last bound the pStages element of VK_SHADER_STAGE_VERTEX_BIT, VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT, VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT or VK_SHADER_STAGE_GEOMETRY_BIT with a valid shader object other than VK_NULL_HANDLE", 306}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksEXT-pStencilAttachment-06187", 51}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the bound pipeline was created with a VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV structure, and VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, the value of the depthStencilAttachmentSamples member of VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV used to create the bound graphics pipeline must be equal to the sample count used to create VkRenderingInfo::pStencilAttachment->imageView", 519}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksEXT-pStencilAttachment-08965", 51}, { {"If the current render pass instance was begun with vkCmdBeginRendering, there is a graphics pipeline bound, stencil test is enabled and the VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, then the VkPipelineRenderingCreateInfo::stencilAttachmentFormat used to create the pipeline must not be VK_FORMAT_UNDEFINED", 334}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMeshTasksEXT-pipelineFragmentShadingRate-09238", 60}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 459}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksEXT-pipelineFragmentShadingRate-09238", 60}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 439}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksEXT-pipelineStatistics-07076", 51}, { {"The pipelineStatistics member used to create any active Pipeline Statistics Query must not contain VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_VERTICES_BIT, VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_VERTEX_SHADER_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_CLIPPING_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_CLIPPING_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_CONTROL_SHADER_PATCHES_BIT, or VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_EVALUATION_SHADER_INVOCATIONS_BIT", 648}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksEXT-primitiveFragmentShadingRateWithMultipleViewports-04552", 82}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT dynamic state enabled, and any of the shader stages of the bound graphics pipeline write to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 481}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksEXT-primitiveFragmentShadingRateWithMultipleViewports-08642", 82}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, and any shader object bound to a graphics stage writes to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 361}, { "chapters/drawing.html", 21} } },
@@ -14131,8 +14151,8 @@
         { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-None-07639", 50}, { {"If the depthClipControl feature is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE_EXT dynamic state enabled, then vkCmdSetDepthClipNegativeOneToOneEXT must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 385}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-None-07640", 50}, { {"If the VK_NV_clip_space_w_scaling extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_ENABLE_NV dynamic state enabled, then vkCmdSetViewportWScalingEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 387}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-None-07641", 50}, { {"If the VK_NV_viewport_swizzle extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_SWIZZLE_NV dynamic state enabled, then vkCmdSetViewportSwizzleNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 367}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-None-07642", 50}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 469}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-None-07643", 50}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 528}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-None-07642", 50}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-None-07643", 50}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 508}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-None-07644", 50}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_MODE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageModulationModeNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-None-07645", 50}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_ENABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationMode is any value other than VK_COVERAGE_MODULATION_MODE_NONE_NV, then vkCmdSetCoverageModulationTableEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 569}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-None-07646", 50}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationTableEnable is VK_TRUE, then vkCmdSetCoverageModulationTableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 514}, { "chapters/drawing.html", 21} } },
@@ -14305,6 +14325,7 @@
         { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-flags-02696", 51}, { {"Any VkImage created with a VkImageCreateInfo::flags containing VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV sampled as a result of this command must only be sampled using a VkSamplerAddressMode of VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE", 227}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-flags-10582", 51}, { {"If the current render pass instance was begun with a vkCmdBeginRendering call in commandBuffer, its VkRenderingInfo::flags parameter must not have VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT set unless VK_RENDERING_CONTENTS_INLINE_BIT_KHR is also set", 258}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-format-07753", 52}, { {"If a VkImageView or VkBufferView is accessed as a result of this command, then the numeric type of the view's format and the Sampled Type operand of the OpTypeImage must match", 175}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-imageLayout-00344", 57}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-imageView-06172", 55}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the depth attachment", 292}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-imageView-06173", 55}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pStencilAttachment is not VK_NULL_HANDLE, and the layout member of pStencilAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the stencil attachment", 298}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-imageView-06174", 55}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, this command must not write any values to the depth attachment", 303}, { "chapters/drawing.html", 21} } },
@@ -14342,7 +14363,7 @@
         { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-pStages-10680", 53}, { {"If there is no bound graphics pipeline, vkCmdBindShadersEXT must not have last bound the pStages element of VK_SHADER_STAGE_VERTEX_BIT, VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT, VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT or VK_SHADER_STAGE_GEOMETRY_BIT with a valid shader object other than VK_NULL_HANDLE", 306}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-pStencilAttachment-06187", 64}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the bound pipeline was created with a VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV structure, and VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, the value of the depthStencilAttachmentSamples member of VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV used to create the bound graphics pipeline must be equal to the sample count used to create VkRenderingInfo::pStencilAttachment->imageView", 519}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-pStencilAttachment-08965", 64}, { {"If the current render pass instance was begun with vkCmdBeginRendering, there is a graphics pipeline bound, stencil test is enabled and the VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, then the VkPipelineRenderingCreateInfo::stencilAttachmentFormat used to create the pipeline must not be VK_FORMAT_UNDEFINED", 334}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-pipelineFragmentShadingRate-09238", 73}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 459}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-pipelineFragmentShadingRate-09238", 73}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 439}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-pipelineStatistics-07076", 64}, { {"The pipelineStatistics member used to create any active Pipeline Statistics Query must not contain VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_VERTICES_BIT, VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_VERTEX_SHADER_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_CLIPPING_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_CLIPPING_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_CONTROL_SHADER_PATCHES_BIT, or VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_EVALUATION_SHADER_INVOCATIONS_BIT", 648}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-primitiveFragmentShadingRateWithMultipleViewports-04552", 95}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT dynamic state enabled, and any of the shader stages of the bound graphics pipeline write to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 481}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountEXT-primitiveFragmentShadingRateWithMultipleViewports-08642", 95}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, and any shader object bound to a graphics stage writes to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 361}, { "chapters/drawing.html", 21} } },
@@ -14437,8 +14458,8 @@
         { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-None-07639", 49}, { {"If the depthClipControl feature is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE_EXT dynamic state enabled, then vkCmdSetDepthClipNegativeOneToOneEXT must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 385}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-None-07640", 49}, { {"If the VK_NV_clip_space_w_scaling extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_ENABLE_NV dynamic state enabled, then vkCmdSetViewportWScalingEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 387}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-None-07641", 49}, { {"If the VK_NV_viewport_swizzle extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_SWIZZLE_NV dynamic state enabled, then vkCmdSetViewportSwizzleNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 367}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-None-07642", 49}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 469}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-None-07643", 49}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 528}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-None-07642", 49}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-None-07643", 49}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 508}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-None-07644", 49}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_MODE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageModulationModeNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-None-07645", 49}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_ENABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationMode is any value other than VK_COVERAGE_MODULATION_MODE_NONE_NV, then vkCmdSetCoverageModulationTableEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 569}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-None-07646", 49}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationTableEnable is VK_TRUE, then vkCmdSetCoverageModulationTableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 514}, { "chapters/drawing.html", 21} } },
@@ -14611,6 +14632,7 @@
         { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-flags-02696", 50}, { {"Any VkImage created with a VkImageCreateInfo::flags containing VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV sampled as a result of this command must only be sampled using a VkSamplerAddressMode of VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE", 227}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-flags-10582", 50}, { {"If the current render pass instance was begun with a vkCmdBeginRendering call in commandBuffer, its VkRenderingInfo::flags parameter must not have VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT set unless VK_RENDERING_CONTENTS_INLINE_BIT_KHR is also set", 258}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-format-07753", 51}, { {"If a VkImageView or VkBufferView is accessed as a result of this command, then the numeric type of the view's format and the Sampled Type operand of the OpTypeImage must match", 175}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-imageLayout-00344", 56}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-imageView-06172", 54}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the depth attachment", 292}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-imageView-06173", 54}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pStencilAttachment is not VK_NULL_HANDLE, and the layout member of pStencilAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the stencil attachment", 298}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-imageView-06174", 54}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, this command must not write any values to the depth attachment", 303}, { "chapters/drawing.html", 21} } },
@@ -14648,7 +14670,7 @@
         { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-pStages-10680", 52}, { {"If there is no bound graphics pipeline, vkCmdBindShadersEXT must not have last bound the pStages element of VK_SHADER_STAGE_VERTEX_BIT, VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT, VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT or VK_SHADER_STAGE_GEOMETRY_BIT with a valid shader object other than VK_NULL_HANDLE", 306}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-pStencilAttachment-06187", 63}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the bound pipeline was created with a VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV structure, and VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, the value of the depthStencilAttachmentSamples member of VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV used to create the bound graphics pipeline must be equal to the sample count used to create VkRenderingInfo::pStencilAttachment->imageView", 519}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-pStencilAttachment-08965", 63}, { {"If the current render pass instance was begun with vkCmdBeginRendering, there is a graphics pipeline bound, stencil test is enabled and the VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, then the VkPipelineRenderingCreateInfo::stencilAttachmentFormat used to create the pipeline must not be VK_FORMAT_UNDEFINED", 334}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-pipelineFragmentShadingRate-09238", 72}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 459}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-pipelineFragmentShadingRate-09238", 72}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 439}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-pipelineStatistics-07076", 63}, { {"The pipelineStatistics member used to create any active Pipeline Statistics Query must not contain VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_VERTICES_BIT, VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_VERTEX_SHADER_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_CLIPPING_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_CLIPPING_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_CONTROL_SHADER_PATCHES_BIT, or VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_EVALUATION_SHADER_INVOCATIONS_BIT", 648}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-primitiveFragmentShadingRateWithMultipleViewports-04552", 94}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT dynamic state enabled, and any of the shader stages of the bound graphics pipeline write to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 481}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectCountNV-primitiveFragmentShadingRateWithMultipleViewports-08642", 94}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, and any shader object bound to a graphics stage writes to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 361}, { "chapters/drawing.html", 21} } },
@@ -14742,8 +14764,8 @@
         { {"VUID-vkCmdDrawMeshTasksIndirectEXT-None-07639", 45}, { {"If the depthClipControl feature is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE_EXT dynamic state enabled, then vkCmdSetDepthClipNegativeOneToOneEXT must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 385}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectEXT-None-07640", 45}, { {"If the VK_NV_clip_space_w_scaling extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_ENABLE_NV dynamic state enabled, then vkCmdSetViewportWScalingEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 387}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectEXT-None-07641", 45}, { {"If the VK_NV_viewport_swizzle extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_SWIZZLE_NV dynamic state enabled, then vkCmdSetViewportSwizzleNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 367}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMeshTasksIndirectEXT-None-07642", 45}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 469}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMeshTasksIndirectEXT-None-07643", 45}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 528}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksIndirectEXT-None-07642", 45}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksIndirectEXT-None-07643", 45}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 508}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectEXT-None-07644", 45}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_MODE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageModulationModeNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectEXT-None-07645", 45}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_ENABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationMode is any value other than VK_COVERAGE_MODULATION_MODE_NONE_NV, then vkCmdSetCoverageModulationTableEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 569}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectEXT-None-07646", 45}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationTableEnable is VK_TRUE, then vkCmdSetCoverageModulationTableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 514}, { "chapters/drawing.html", 21} } },
@@ -14915,6 +14937,7 @@
         { {"VUID-vkCmdDrawMeshTasksIndirectEXT-flags-02696", 46}, { {"Any VkImage created with a VkImageCreateInfo::flags containing VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV sampled as a result of this command must only be sampled using a VkSamplerAddressMode of VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE", 227}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectEXT-flags-10582", 46}, { {"If the current render pass instance was begun with a vkCmdBeginRendering call in commandBuffer, its VkRenderingInfo::flags parameter must not have VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT set unless VK_RENDERING_CONTENTS_INLINE_BIT_KHR is also set", 258}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectEXT-format-07753", 47}, { {"If a VkImageView or VkBufferView is accessed as a result of this command, then the numeric type of the view's format and the Sampled Type operand of the OpTypeImage must match", 175}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksIndirectEXT-imageLayout-00344", 52}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectEXT-imageView-06172", 50}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the depth attachment", 292}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectEXT-imageView-06173", 50}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pStencilAttachment is not VK_NULL_HANDLE, and the layout member of pStencilAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the stencil attachment", 298}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectEXT-imageView-06174", 50}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, this command must not write any values to the depth attachment", 303}, { "chapters/drawing.html", 21} } },
@@ -14951,7 +14974,7 @@
         { {"VUID-vkCmdDrawMeshTasksIndirectEXT-pStages-10680", 48}, { {"If there is no bound graphics pipeline, vkCmdBindShadersEXT must not have last bound the pStages element of VK_SHADER_STAGE_VERTEX_BIT, VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT, VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT or VK_SHADER_STAGE_GEOMETRY_BIT with a valid shader object other than VK_NULL_HANDLE", 306}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectEXT-pStencilAttachment-06187", 59}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the bound pipeline was created with a VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV structure, and VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, the value of the depthStencilAttachmentSamples member of VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV used to create the bound graphics pipeline must be equal to the sample count used to create VkRenderingInfo::pStencilAttachment->imageView", 519}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectEXT-pStencilAttachment-08965", 59}, { {"If the current render pass instance was begun with vkCmdBeginRendering, there is a graphics pipeline bound, stencil test is enabled and the VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, then the VkPipelineRenderingCreateInfo::stencilAttachmentFormat used to create the pipeline must not be VK_FORMAT_UNDEFINED", 334}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMeshTasksIndirectEXT-pipelineFragmentShadingRate-09238", 68}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 459}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksIndirectEXT-pipelineFragmentShadingRate-09238", 68}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 439}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectEXT-pipelineStatistics-07076", 59}, { {"The pipelineStatistics member used to create any active Pipeline Statistics Query must not contain VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_VERTICES_BIT, VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_VERTEX_SHADER_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_CLIPPING_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_CLIPPING_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_CONTROL_SHADER_PATCHES_BIT, or VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_EVALUATION_SHADER_INVOCATIONS_BIT", 648}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectEXT-primitiveFragmentShadingRateWithMultipleViewports-04552", 90}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT dynamic state enabled, and any of the shader stages of the bound graphics pipeline write to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 481}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectEXT-primitiveFragmentShadingRateWithMultipleViewports-08642", 90}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, and any shader object bound to a graphics stage writes to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 361}, { "chapters/drawing.html", 21} } },
@@ -15044,8 +15067,8 @@
         { {"VUID-vkCmdDrawMeshTasksIndirectNV-None-07639", 44}, { {"If the depthClipControl feature is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE_EXT dynamic state enabled, then vkCmdSetDepthClipNegativeOneToOneEXT must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 385}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectNV-None-07640", 44}, { {"If the VK_NV_clip_space_w_scaling extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_ENABLE_NV dynamic state enabled, then vkCmdSetViewportWScalingEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 387}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectNV-None-07641", 44}, { {"If the VK_NV_viewport_swizzle extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_SWIZZLE_NV dynamic state enabled, then vkCmdSetViewportSwizzleNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 367}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMeshTasksIndirectNV-None-07642", 44}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 469}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMeshTasksIndirectNV-None-07643", 44}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 528}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksIndirectNV-None-07642", 44}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksIndirectNV-None-07643", 44}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 508}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectNV-None-07644", 44}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_MODE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageModulationModeNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectNV-None-07645", 44}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_ENABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationMode is any value other than VK_COVERAGE_MODULATION_MODE_NONE_NV, then vkCmdSetCoverageModulationTableEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 569}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectNV-None-07646", 44}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationTableEnable is VK_TRUE, then vkCmdSetCoverageModulationTableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 514}, { "chapters/drawing.html", 21} } },
@@ -15217,6 +15240,7 @@
         { {"VUID-vkCmdDrawMeshTasksIndirectNV-flags-02696", 45}, { {"Any VkImage created with a VkImageCreateInfo::flags containing VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV sampled as a result of this command must only be sampled using a VkSamplerAddressMode of VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE", 227}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectNV-flags-10582", 45}, { {"If the current render pass instance was begun with a vkCmdBeginRendering call in commandBuffer, its VkRenderingInfo::flags parameter must not have VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT set unless VK_RENDERING_CONTENTS_INLINE_BIT_KHR is also set", 258}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectNV-format-07753", 46}, { {"If a VkImageView or VkBufferView is accessed as a result of this command, then the numeric type of the view's format and the Sampled Type operand of the OpTypeImage must match", 175}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksIndirectNV-imageLayout-00344", 51}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectNV-imageView-06172", 49}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the depth attachment", 292}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectNV-imageView-06173", 49}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pStencilAttachment is not VK_NULL_HANDLE, and the layout member of pStencilAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the stencil attachment", 298}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectNV-imageView-06174", 49}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, this command must not write any values to the depth attachment", 303}, { "chapters/drawing.html", 21} } },
@@ -15253,7 +15277,7 @@
         { {"VUID-vkCmdDrawMeshTasksIndirectNV-pStages-10680", 47}, { {"If there is no bound graphics pipeline, vkCmdBindShadersEXT must not have last bound the pStages element of VK_SHADER_STAGE_VERTEX_BIT, VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT, VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT or VK_SHADER_STAGE_GEOMETRY_BIT with a valid shader object other than VK_NULL_HANDLE", 306}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectNV-pStencilAttachment-06187", 58}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the bound pipeline was created with a VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV structure, and VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, the value of the depthStencilAttachmentSamples member of VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV used to create the bound graphics pipeline must be equal to the sample count used to create VkRenderingInfo::pStencilAttachment->imageView", 519}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectNV-pStencilAttachment-08965", 58}, { {"If the current render pass instance was begun with vkCmdBeginRendering, there is a graphics pipeline bound, stencil test is enabled and the VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, then the VkPipelineRenderingCreateInfo::stencilAttachmentFormat used to create the pipeline must not be VK_FORMAT_UNDEFINED", 334}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMeshTasksIndirectNV-pipelineFragmentShadingRate-09238", 67}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 459}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksIndirectNV-pipelineFragmentShadingRate-09238", 67}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 439}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectNV-pipelineStatistics-07076", 58}, { {"The pipelineStatistics member used to create any active Pipeline Statistics Query must not contain VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_VERTICES_BIT, VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_VERTEX_SHADER_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_CLIPPING_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_CLIPPING_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_CONTROL_SHADER_PATCHES_BIT, or VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_EVALUATION_SHADER_INVOCATIONS_BIT", 648}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectNV-primitiveFragmentShadingRateWithMultipleViewports-04552", 89}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT dynamic state enabled, and any of the shader stages of the bound graphics pipeline write to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 481}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksIndirectNV-primitiveFragmentShadingRateWithMultipleViewports-08642", 89}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, and any shader object bound to a graphics stage writes to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 361}, { "chapters/drawing.html", 21} } },
@@ -15346,8 +15370,8 @@
         { {"VUID-vkCmdDrawMeshTasksNV-None-07639", 36}, { {"If the depthClipControl feature is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE_EXT dynamic state enabled, then vkCmdSetDepthClipNegativeOneToOneEXT must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 385}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksNV-None-07640", 36}, { {"If the VK_NV_clip_space_w_scaling extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_ENABLE_NV dynamic state enabled, then vkCmdSetViewportWScalingEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 387}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksNV-None-07641", 36}, { {"If the VK_NV_viewport_swizzle extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_SWIZZLE_NV dynamic state enabled, then vkCmdSetViewportSwizzleNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 367}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMeshTasksNV-None-07642", 36}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 469}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMeshTasksNV-None-07643", 36}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 528}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksNV-None-07642", 36}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksNV-None-07643", 36}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 508}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksNV-None-07644", 36}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_MODE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageModulationModeNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksNV-None-07645", 36}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_ENABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationMode is any value other than VK_COVERAGE_MODULATION_MODE_NONE_NV, then vkCmdSetCoverageModulationTableEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 569}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksNV-None-07646", 36}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationTableEnable is VK_TRUE, then vkCmdSetCoverageModulationTableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 514}, { "chapters/drawing.html", 21} } },
@@ -15509,6 +15533,7 @@
         { {"VUID-vkCmdDrawMeshTasksNV-flags-02696", 37}, { {"Any VkImage created with a VkImageCreateInfo::flags containing VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV sampled as a result of this command must only be sampled using a VkSamplerAddressMode of VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE", 227}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksNV-flags-10582", 37}, { {"If the current render pass instance was begun with a vkCmdBeginRendering call in commandBuffer, its VkRenderingInfo::flags parameter must not have VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT set unless VK_RENDERING_CONTENTS_INLINE_BIT_KHR is also set", 258}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksNV-format-07753", 38}, { {"If a VkImageView or VkBufferView is accessed as a result of this command, then the numeric type of the view's format and the Sampled Type operand of the OpTypeImage must match", 175}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksNV-imageLayout-00344", 43}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksNV-imageView-06172", 41}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the depth attachment", 292}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksNV-imageView-06173", 41}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pStencilAttachment is not VK_NULL_HANDLE, and the layout member of pStencilAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the stencil attachment", 298}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksNV-imageView-06174", 41}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, this command must not write any values to the depth attachment", 303}, { "chapters/drawing.html", 21} } },
@@ -15544,7 +15569,7 @@
         { {"VUID-vkCmdDrawMeshTasksNV-pStages-10680", 39}, { {"If there is no bound graphics pipeline, vkCmdBindShadersEXT must not have last bound the pStages element of VK_SHADER_STAGE_VERTEX_BIT, VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT, VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT or VK_SHADER_STAGE_GEOMETRY_BIT with a valid shader object other than VK_NULL_HANDLE", 306}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksNV-pStencilAttachment-06187", 50}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the bound pipeline was created with a VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV structure, and VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, the value of the depthStencilAttachmentSamples member of VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV used to create the bound graphics pipeline must be equal to the sample count used to create VkRenderingInfo::pStencilAttachment->imageView", 519}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksNV-pStencilAttachment-08965", 50}, { {"If the current render pass instance was begun with vkCmdBeginRendering, there is a graphics pipeline bound, stencil test is enabled and the VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, then the VkPipelineRenderingCreateInfo::stencilAttachmentFormat used to create the pipeline must not be VK_FORMAT_UNDEFINED", 334}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMeshTasksNV-pipelineFragmentShadingRate-09238", 59}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 459}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMeshTasksNV-pipelineFragmentShadingRate-09238", 59}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 439}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksNV-pipelineStatistics-07076", 50}, { {"The pipelineStatistics member used to create any active Pipeline Statistics Query must not contain VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_VERTICES_BIT, VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_VERTEX_SHADER_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_CLIPPING_INVOCATIONS_BIT, VK_QUERY_PIPELINE_STATISTIC_CLIPPING_PRIMITIVES_BIT, VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_CONTROL_SHADER_PATCHES_BIT, or VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_EVALUATION_SHADER_INVOCATIONS_BIT", 648}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksNV-primitiveFragmentShadingRateWithMultipleViewports-04552", 81}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT dynamic state enabled, and any of the shader stages of the bound graphics pipeline write to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 481}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMeshTasksNV-primitiveFragmentShadingRateWithMultipleViewports-08642", 81}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, and any shader object bound to a graphics stage writes to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 361}, { "chapters/drawing.html", 21} } },
@@ -15645,8 +15670,8 @@
         { {"VUID-vkCmdDrawMultiEXT-None-07639", 33}, { {"If the depthClipControl feature is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE_EXT dynamic state enabled, then vkCmdSetDepthClipNegativeOneToOneEXT must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 385}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiEXT-None-07640", 33}, { {"If the VK_NV_clip_space_w_scaling extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_ENABLE_NV dynamic state enabled, then vkCmdSetViewportWScalingEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 387}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiEXT-None-07641", 33}, { {"If the VK_NV_viewport_swizzle extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_SWIZZLE_NV dynamic state enabled, then vkCmdSetViewportSwizzleNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 367}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMultiEXT-None-07642", 33}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 469}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMultiEXT-None-07643", 33}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 528}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMultiEXT-None-07642", 33}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMultiEXT-None-07643", 33}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 508}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiEXT-None-07644", 33}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_MODE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageModulationModeNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiEXT-None-07645", 33}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_ENABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationMode is any value other than VK_COVERAGE_MODULATION_MODE_NONE_NV, then vkCmdSetCoverageModulationTableEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 569}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiEXT-None-07646", 33}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationTableEnable is VK_TRUE, then vkCmdSetCoverageModulationTableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 514}, { "chapters/drawing.html", 21} } },
@@ -15823,6 +15848,7 @@
         { {"VUID-vkCmdDrawMultiEXT-format-08937", 35}, { {"If there is a shader object bound to the VK_SHADER_STAGE_VERTEX_BIT stage or the bound graphics pipeline state was created with the VK_DYNAMIC_STATE_VERTEX_INPUT_EXT dynamic state enabled and the scalar width associated with a Location decorated Input variable in the Vertex Execution Model OpEntryPoint is 64-bit, then the corresponding VkVertexInputAttributeDescription2EXT::format must have a 64-bit component", 412}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiEXT-format-10389", 35}, { {"For each vertex attribute accessed by this command, if its VkVertexInputAttributeDescription::format or VkVertexInputAttributeDescription2EXT::format is a packed format, and the legacyVertexAttributes feature is not enabled, the value of attribAddress, calculated as described in Vertex Input Calculation, must be a multiple of the size of the format", 350}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiEXT-format-10390", 35}, { {"For each vertex attribute accessed by this command, if its VkVertexInputAttributeDescription::format or VkVertexInputAttributeDescription2EXT::format is not a packed format, and either the legacyVertexAttributes feature is not enabled or format has 64-bit components, the value of attribAddress, calculated as described in Vertex Input Calculation, must be a multiple of the component size of the format", 403}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMultiEXT-imageLayout-00344", 40}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiEXT-imageView-06172", 38}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the depth attachment", 292}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiEXT-imageView-06173", 38}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pStencilAttachment is not VK_NULL_HANDLE, and the layout member of pStencilAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the stencil attachment", 298}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiEXT-imageView-06174", 38}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, this command must not write any values to the depth attachment", 303}, { "chapters/drawing.html", 21} } },
@@ -15859,7 +15885,7 @@
         { {"VUID-vkCmdDrawMultiEXT-pStencilAttachment-06187", 47}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the bound pipeline was created with a VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV structure, and VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, the value of the depthStencilAttachmentSamples member of VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV used to create the bound graphics pipeline must be equal to the sample count used to create VkRenderingInfo::pStencilAttachment->imageView", 519}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiEXT-pStencilAttachment-08965", 47}, { {"If the current render pass instance was begun with vkCmdBeginRendering, there is a graphics pipeline bound, stencil test is enabled and the VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, then the VkPipelineRenderingCreateInfo::stencilAttachmentFormat used to create the pipeline must not be VK_FORMAT_UNDEFINED", 334}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiEXT-pStrides-04913", 37}, { {"If the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE dynamic state enabled, but without the VK_DYNAMIC_STATE_VERTEX_INPUT_EXT dynamic state enabled, then vkCmdBindVertexBuffers2 must have been called and not subsequently invalidated in the current command buffer prior to this draw command, and the pStrides parameter of vkCmdBindVertexBuffers2 must not be NULL", 405}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMultiEXT-pipelineFragmentShadingRate-09238", 56}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 459}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMultiEXT-pipelineFragmentShadingRate-09238", 56}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 439}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiEXT-primitiveFragmentShadingRateWithMultipleViewports-04552", 78}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT dynamic state enabled, and any of the shader stages of the bound graphics pipeline write to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 481}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiEXT-primitiveFragmentShadingRateWithMultipleViewports-08642", 78}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, and any shader object bound to a graphics stage writes to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 361}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiEXT-primitiveTopology-10286", 46}, { {"If a VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT stage is bound, then the current value of primitiveTopology must be VK_PRIMITIVE_TOPOLOGY_PATCH_LIST prior to this drawing command", 176}, { "chapters/drawing.html", 21} } },
@@ -15962,8 +15988,8 @@
         { {"VUID-vkCmdDrawMultiIndexedEXT-None-07639", 40}, { {"If the depthClipControl feature is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE_EXT dynamic state enabled, then vkCmdSetDepthClipNegativeOneToOneEXT must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 385}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiIndexedEXT-None-07640", 40}, { {"If the VK_NV_clip_space_w_scaling extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_ENABLE_NV dynamic state enabled, then vkCmdSetViewportWScalingEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 387}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiIndexedEXT-None-07641", 40}, { {"If the VK_NV_viewport_swizzle extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_SWIZZLE_NV dynamic state enabled, then vkCmdSetViewportSwizzleNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 367}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMultiIndexedEXT-None-07642", 40}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 469}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMultiIndexedEXT-None-07643", 40}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 528}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMultiIndexedEXT-None-07642", 40}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMultiIndexedEXT-None-07643", 40}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 508}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiIndexedEXT-None-07644", 40}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_MODE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageModulationModeNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiIndexedEXT-None-07645", 40}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_ENABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationMode is any value other than VK_COVERAGE_MODULATION_MODE_NONE_NV, then vkCmdSetCoverageModulationTableEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 569}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiIndexedEXT-None-07646", 40}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationTableEnable is VK_TRUE, then vkCmdSetCoverageModulationTableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 514}, { "chapters/drawing.html", 21} } },
@@ -16140,6 +16166,7 @@
         { {"VUID-vkCmdDrawMultiIndexedEXT-format-08937", 42}, { {"If there is a shader object bound to the VK_SHADER_STAGE_VERTEX_BIT stage or the bound graphics pipeline state was created with the VK_DYNAMIC_STATE_VERTEX_INPUT_EXT dynamic state enabled and the scalar width associated with a Location decorated Input variable in the Vertex Execution Model OpEntryPoint is 64-bit, then the corresponding VkVertexInputAttributeDescription2EXT::format must have a 64-bit component", 412}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiIndexedEXT-format-10389", 42}, { {"For each vertex attribute accessed by this command, if its VkVertexInputAttributeDescription::format or VkVertexInputAttributeDescription2EXT::format is a packed format, and the legacyVertexAttributes feature is not enabled, the value of attribAddress, calculated as described in Vertex Input Calculation, must be a multiple of the size of the format", 350}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiIndexedEXT-format-10390", 42}, { {"For each vertex attribute accessed by this command, if its VkVertexInputAttributeDescription::format or VkVertexInputAttributeDescription2EXT::format is not a packed format, and either the legacyVertexAttributes feature is not enabled or format has 64-bit components, the value of attribAddress, calculated as described in Vertex Input Calculation, must be a multiple of the component size of the format", 403}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMultiIndexedEXT-imageLayout-00344", 47}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiIndexedEXT-imageView-06172", 45}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the depth attachment", 292}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiIndexedEXT-imageView-06173", 45}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pStencilAttachment is not VK_NULL_HANDLE, and the layout member of pStencilAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the stencil attachment", 298}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiIndexedEXT-imageView-06174", 45}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, this command must not write any values to the depth attachment", 303}, { "chapters/drawing.html", 21} } },
@@ -16177,7 +16204,7 @@
         { {"VUID-vkCmdDrawMultiIndexedEXT-pStencilAttachment-08965", 54}, { {"If the current render pass instance was begun with vkCmdBeginRendering, there is a graphics pipeline bound, stencil test is enabled and the VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, then the VkPipelineRenderingCreateInfo::stencilAttachmentFormat used to create the pipeline must not be VK_FORMAT_UNDEFINED", 334}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiIndexedEXT-pStrides-04913", 44}, { {"If the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE dynamic state enabled, but without the VK_DYNAMIC_STATE_VERTEX_INPUT_EXT dynamic state enabled, then vkCmdBindVertexBuffers2 must have been called and not subsequently invalidated in the current command buffer prior to this draw command, and the pStrides parameter of vkCmdBindVertexBuffers2 must not be NULL", 405}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiIndexedEXT-pVertexOffset-parameter", 53}, { {"If pVertexOffset is not NULL, pVertexOffset must be a valid pointer to a valid int32_t value", 92}, { "chapters/drawing.html", 21} } },
-        { {"VUID-vkCmdDrawMultiIndexedEXT-pipelineFragmentShadingRate-09238", 63}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 459}, { "chapters/drawing.html", 21} } },
+        { {"VUID-vkCmdDrawMultiIndexedEXT-pipelineFragmentShadingRate-09238", 63}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 439}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiIndexedEXT-primitiveFragmentShadingRateWithMultipleViewports-04552", 85}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT dynamic state enabled, and any of the shader stages of the bound graphics pipeline write to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 481}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiIndexedEXT-primitiveFragmentShadingRateWithMultipleViewports-08642", 85}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, and any shader object bound to a graphics stage writes to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 361}, { "chapters/drawing.html", 21} } },
         { {"VUID-vkCmdDrawMultiIndexedEXT-primitiveTopology-10286", 53}, { {"If a VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT stage is bound, then the current value of primitiveTopology must be VK_PRIMITIVE_TOPOLOGY_PATCH_LIST prior to this drawing command", 176}, { "chapters/drawing.html", 21} } },
@@ -16596,8 +16623,8 @@
         { {"VUID-vkCmdExecuteGeneratedCommandsEXT-None-07639", 48}, { {"If the depthClipControl feature is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE_EXT dynamic state enabled, then vkCmdSetDepthClipNegativeOneToOneEXT must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 385}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsEXT-None-07640", 48}, { {"If the VK_NV_clip_space_w_scaling extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_ENABLE_NV dynamic state enabled, then vkCmdSetViewportWScalingEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 387}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsEXT-None-07641", 48}, { {"If the VK_NV_viewport_swizzle extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_SWIZZLE_NV dynamic state enabled, then vkCmdSetViewportSwizzleNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 367}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
-        { {"VUID-vkCmdExecuteGeneratedCommandsEXT-None-07642", 48}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 469}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
-        { {"VUID-vkCmdExecuteGeneratedCommandsEXT-None-07643", 48}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 528}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
+        { {"VUID-vkCmdExecuteGeneratedCommandsEXT-None-07642", 48}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
+        { {"VUID-vkCmdExecuteGeneratedCommandsEXT-None-07643", 48}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 508}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsEXT-None-07644", 48}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_MODE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageModulationModeNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsEXT-None-07645", 48}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_ENABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationMode is any value other than VK_COVERAGE_MODULATION_MODE_NONE_NV, then vkCmdSetCoverageModulationTableEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 569}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsEXT-None-07646", 48}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationTableEnable is VK_TRUE, then vkCmdSetCoverageModulationTableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 514}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
@@ -16763,6 +16790,7 @@
         { {"VUID-vkCmdExecuteGeneratedCommandsEXT-flags-02696", 49}, { {"Any VkImage created with a VkImageCreateInfo::flags containing VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV sampled as a result of this command must only be sampled using a VkSamplerAddressMode of VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE", 227}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsEXT-flags-10582", 49}, { {"If the current render pass instance was begun with a vkCmdBeginRendering call in commandBuffer, its VkRenderingInfo::flags parameter must not have VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT set unless VK_RENDERING_CONTENTS_INLINE_BIT_KHR is also set", 258}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsEXT-format-07753", 50}, { {"If a VkImageView or VkBufferView is accessed as a result of this command, then the numeric type of the view's format and the Sampled Type operand of the OpTypeImage must match", 175}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
+        { {"VUID-vkCmdExecuteGeneratedCommandsEXT-imageLayout-00344", 55}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsEXT-imageView-06172", 53}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the depth attachment", 292}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsEXT-imageView-06173", 53}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pStencilAttachment is not VK_NULL_HANDLE, and the layout member of pStencilAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the stencil attachment", 298}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsEXT-imageView-06174", 53}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, this command must not write any values to the depth attachment", 303}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
@@ -16814,7 +16842,7 @@
         { {"VUID-vkCmdExecuteGeneratedCommandsEXT-pNext-07935", 49}, { {"If this command is called inside a render pass instance started with vkCmdBeginRendering, and the pNext chain of VkRenderingInfo includes a VkMultisampledRenderToSingleSampledInfoEXT structure with multisampledRenderToSingleSampledEnable equal to VK_TRUE, then the value of rasterizationSamples for the bound graphics pipeline must be equal to VkMultisampledRenderToSingleSampledInfoEXT::rasterizationSamples", 408}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsEXT-pStencilAttachment-06187", 62}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the bound pipeline was created with a VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV structure, and VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, the value of the depthStencilAttachmentSamples member of VkAttachmentSampleCountInfoAMD or VkAttachmentSampleCountInfoNV used to create the bound graphics pipeline must be equal to the sample count used to create VkRenderingInfo::pStencilAttachment->imageView", 519}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsEXT-pStencilAttachment-08965", 62}, { {"If the current render pass instance was begun with vkCmdBeginRendering, there is a graphics pipeline bound, stencil test is enabled and the VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, then the VkPipelineRenderingCreateInfo::stencilAttachmentFormat used to create the pipeline must not be VK_FORMAT_UNDEFINED", 334}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
-        { {"VUID-vkCmdExecuteGeneratedCommandsEXT-pipelineFragmentShadingRate-09238", 71}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 459}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
+        { {"VUID-vkCmdExecuteGeneratedCommandsEXT-pipelineFragmentShadingRate-09238", 71}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 439}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsEXT-preprocessAddress-11142", 61}, { {"The contents of the preprocessAddress member of pGeneratedCommandsInfo must not have been previously used to record another vkCmdExecuteGeneratedCommandsEXT", 156}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsEXT-primitiveFragmentShadingRateWithMultipleViewports-04552", 93}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT dynamic state enabled, and any of the shader stages of the bound graphics pipeline write to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 481}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsEXT-primitiveFragmentShadingRateWithMultipleViewports-08642", 93}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, and any shader object bound to a graphics stage writes to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 361}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
@@ -16914,8 +16942,8 @@
         { {"VUID-vkCmdExecuteGeneratedCommandsNV-None-07639", 47}, { {"If the depthClipControl feature is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE_EXT dynamic state enabled, then vkCmdSetDepthClipNegativeOneToOneEXT must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 385}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsNV-None-07640", 47}, { {"If the VK_NV_clip_space_w_scaling extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_ENABLE_NV dynamic state enabled, then vkCmdSetViewportWScalingEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 387}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsNV-None-07641", 47}, { {"If the VK_NV_viewport_swizzle extension is enabled, and a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_VIEWPORT_SWIZZLE_NV dynamic state enabled, then vkCmdSetViewportSwizzleNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 367}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
-        { {"VUID-vkCmdExecuteGeneratedCommandsNV-None-07642", 47}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 469}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
-        { {"VUID-vkCmdExecuteGeneratedCommandsNV-None-07643", 47}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 528}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
+        { {"VUID-vkCmdExecuteGeneratedCommandsNV-None-07642", 47}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageToColorEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
+        { {"VUID-vkCmdExecuteGeneratedCommandsNV-None-07643", 47}, { {"If the VK_NV_fragment_coverage_to_color extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_LOCATION_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageToColorEnable is VK_TRUE, then vkCmdSetCoverageToColorLocationNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 508}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsNV-None-07644", 47}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_MODE_NV dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetCoverageModulationModeNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 449}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsNV-None-07645", 47}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_ENABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationMode is any value other than VK_COVERAGE_MODULATION_MODE_NONE_NV, then vkCmdSetCoverageModulationTableEnableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 569}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsNV-None-07646", 47}, { {"If the VK_NV_framebuffer_mixed_samples extension is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_COVERAGE_MODULATION_TABLE_NV dynamic state enabled, the current value of rasterizerDiscardEnable is VK_FALSE, and the current value of coverageModulationTableEnable is VK_TRUE, then vkCmdSetCoverageModulationTableNV must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 514}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
@@ -17087,6 +17115,7 @@
         { {"VUID-vkCmdExecuteGeneratedCommandsNV-format-08937", 49}, { {"If there is a shader object bound to the VK_SHADER_STAGE_VERTEX_BIT stage or the bound graphics pipeline state was created with the VK_DYNAMIC_STATE_VERTEX_INPUT_EXT dynamic state enabled and the scalar width associated with a Location decorated Input variable in the Vertex Execution Model OpEntryPoint is 64-bit, then the corresponding VkVertexInputAttributeDescription2EXT::format must have a 64-bit component", 412}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsNV-format-10389", 49}, { {"For each vertex attribute accessed by this command, if its VkVertexInputAttributeDescription::format or VkVertexInputAttributeDescription2EXT::format is a packed format, and the legacyVertexAttributes feature is not enabled, the value of attribAddress, calculated as described in Vertex Input Calculation, must be a multiple of the size of the format", 350}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsNV-format-10390", 49}, { {"For each vertex attribute accessed by this command, if its VkVertexInputAttributeDescription::format or VkVertexInputAttributeDescription2EXT::format is not a packed format, and either the legacyVertexAttributes feature is not enabled or format has 64-bit components, the value of attribAddress, calculated as described in Vertex Input Calculation, must be a multiple of the component size of the format", 403}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
+        { {"VUID-vkCmdExecuteGeneratedCommandsNV-imageLayout-00344", 54}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsNV-imageView-06172", 52}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the depth attachment", 292}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsNV-imageView-06173", 52}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pStencilAttachment is not VK_NULL_HANDLE, and the layout member of pStencilAttachment is VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, this command must not write any values to the stencil attachment", 298}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsNV-imageView-06174", 52}, { {"If the current render pass instance was begun with vkCmdBeginRendering, the imageView member of pDepthAttachment is not VK_NULL_HANDLE, and the layout member of pDepthAttachment is VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, this command must not write any values to the depth attachment", 303}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
@@ -17125,7 +17154,7 @@
         { {"VUID-vkCmdExecuteGeneratedCommandsNV-pStencilAttachment-08965", 61}, { {"If the current render pass instance was begun with vkCmdBeginRendering, there is a graphics pipeline bound, stencil test is enabled and the VkRenderingInfo::pStencilAttachment->imageView was not VK_NULL_HANDLE, then the VkPipelineRenderingCreateInfo::stencilAttachmentFormat used to create the pipeline must not be VK_FORMAT_UNDEFINED", 334}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsNV-pStrides-04913", 51}, { {"If the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE dynamic state enabled, but without the VK_DYNAMIC_STATE_VERTEX_INPUT_EXT dynamic state enabled, then vkCmdBindVertexBuffers2 must have been called and not subsequently invalidated in the current command buffer prior to this draw command, and the pStrides parameter of vkCmdBindVertexBuffers2 must not be NULL", 405}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsNV-pipeline-02909", 51}, { {"VkGeneratedCommandsInfoNV::pipeline must match the current bound pipeline at VkGeneratedCommandsInfoNV::pipelineBindPoint", 121}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
-        { {"VUID-vkCmdExecuteGeneratedCommandsNV-pipelineFragmentShadingRate-09238", 70}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to the VK_SHADER_STAGE_FRAGMENT_BIT stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 459}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
+        { {"VUID-vkCmdExecuteGeneratedCommandsNV-pipelineFragmentShadingRate-09238", 70}, { {"If the pipelineFragmentShadingRate feature is enabled, a shader object is bound to any graphics stage or a graphics pipeline is bound which was created with the VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR dynamic state enabled, and the current value of rasterizerDiscardEnable is VK_FALSE, then vkCmdSetFragmentShadingRateKHR must have been called and not subsequently invalidated in the current command buffer prior to this drawing command", 439}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsNV-primitiveFragmentShadingRateWithMultipleViewports-04552", 92}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, the bound graphics pipeline was created with the VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT dynamic state enabled, and any of the shader stages of the bound graphics pipeline write to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 481}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsNV-primitiveFragmentShadingRateWithMultipleViewports-08642", 92}, { {"If the primitiveFragmentShadingRateWithMultipleViewports limit is not supported, and any shader object bound to a graphics stage writes to the PrimitiveShadingRateKHR built-in, then vkCmdSetViewportWithCount must have been called in the current command buffer prior to this drawing command, and the viewportCount parameter of vkCmdSetViewportWithCount must be 1", 361}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
         { {"VUID-vkCmdExecuteGeneratedCommandsNV-primitiveTopology-10286", 60}, { {"If a VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT stage is bound, then the current value of primitiveTopology must be VK_PRIMITIVE_TOPOLOGY_PATCH_LIST prior to this drawing command", 176}, { "chapters/device_generated_commands/generatedcommands.html", 57} } },
@@ -17188,7 +17217,7 @@
         { {"VUID-vkCmdFillBuffer-apiVersion-07894", 37}, { {"If the VK_KHR_maintenance1 extension is not enabled and VkPhysicalDeviceProperties::apiVersion is less than Vulkan 1.1, the VkCommandPool that commandBuffer was allocated from must support graphics or compute operations", 219}, { "chapters/clears.html", 20} } },
         { {"VUID-vkCmdFillBuffer-commandBuffer-01811", 40}, { {"If commandBuffer is an unprotected command buffer and protectedNoFault is not supported, dstBuffer must not be a protected buffer", 129}, { "chapters/clears.html", 20} } },
         { {"VUID-vkCmdFillBuffer-commandBuffer-01812", 40}, { {"If commandBuffer is a protected command buffer and protectedNoFault is not supported, dstBuffer must not be an unprotected buffer", 129}, { "chapters/clears.html", 20} } },
-        { {"VUID-vkCmdFillBuffer-commandBuffer-cmdpool", 42}, { {"The VkCommandPool that commandBuffer was allocated from must support transfer, graphics or compute operations", 109}, { "chapters/clears.html", 20} } },
+        { {"VUID-vkCmdFillBuffer-commandBuffer-cmdpool", 42}, { {"The VkCommandPool that commandBuffer was allocated from must support VK_QUEUE_COMPUTE_BIT, VK_QUEUE_GRAPHICS_BIT, or VK_QUEUE_TRANSFER_BIT operations", 149}, { "chapters/clears.html", 20} } },
         { {"VUID-vkCmdFillBuffer-commandBuffer-parameter", 44}, { {"commandBuffer must be a valid VkCommandBuffer handle", 52}, { "chapters/clears.html", 20} } },
         { {"VUID-vkCmdFillBuffer-commandBuffer-recording", 44}, { {"commandBuffer must be in the recording state", 44}, { "chapters/clears.html", 20} } },
         { {"VUID-vkCmdFillBuffer-commonparent", 33}, { {"Both of commandBuffer, and dstBuffer must have been created, allocated, or retrieved from the same VkDevice", 107}, { "chapters/clears.html", 20} } },
@@ -18225,6 +18254,7 @@
         { {"VUID-vkCmdSubpassShadingHUAWEI-filterCubicMinmax-02695", 54}, { {"Any VkImageView being sampled with VK_FILTER_CUBIC_EXT with a reduction mode of either VK_SAMPLER_REDUCTION_MODE_MIN or VK_SAMPLER_REDUCTION_MODE_MAX as a result of this command must have a VkImageViewType and format that supports cubic filtering together with minmax filtering, as specified by VkFilterCubicImageViewImageFormatPropertiesEXT::filterCubicMinmax returned by vkGetPhysicalDeviceImageFormatProperties2", 414}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdSubpassShadingHUAWEI-flags-02696", 42}, { {"Any VkImage created with a VkImageCreateInfo::flags containing VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV sampled as a result of this command must only be sampled using a VkSamplerAddressMode of VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE", 227}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdSubpassShadingHUAWEI-format-07753", 43}, { {"If a VkImageView or VkBufferView is accessed as a result of this command, then the numeric type of the view's format and the Sampled Type operand of the OpTypeImage must match", 175}, { "chapters/dispatch.html", 22} } },
+        { {"VUID-vkCmdSubpassShadingHUAWEI-imageLayout-00344", 48}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdSubpassShadingHUAWEI-magFilter-04553", 46}, { {"If a VkSampler created with magFilter or minFilter equal to VK_FILTER_LINEAR, reductionMode equal to VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE, and compareEnable equal to VK_FALSE is used to sample a VkImageView as a result of this command, then the image view's format features must contain VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT", 342}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdSubpassShadingHUAWEI-magFilter-09598", 46}, { {"If a VkSampler created with magFilter or minFilter equal to VK_FILTER_LINEAR and reductionMode equal to either VK_SAMPLER_REDUCTION_MODE_MIN or VK_SAMPLER_REDUCTION_MODE_MAX is used to sample a VkImageView as a result of this command, then the image view's format features must contain VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_MINMAX_BIT", 335}, { "chapters/dispatch.html", 22} } },
         { {"VUID-vkCmdSubpassShadingHUAWEI-maintenance4-08602", 49}, { {"If the maintenance4 feature is not enabled, then for each push constant that is statically used by a bound shader, a push constant value must have been set for the same pipeline bind point, with a VkPipelineLayout that is compatible for push constants, with the VkPipelineLayout used to create the current VkPipeline or the VkDescriptorSetLayout and VkPushConstantRange arrays used to create the current VkShaderEXT , as described in Pipeline Layout Compatibility", 463}, { "chapters/dispatch.html", 22} } },
@@ -18304,6 +18334,7 @@
         { {"VUID-vkCmdTraceRaysIndirect2KHR-filterCubicMinmax-02695", 55}, { {"Any VkImageView being sampled with VK_FILTER_CUBIC_EXT with a reduction mode of either VK_SAMPLER_REDUCTION_MODE_MIN or VK_SAMPLER_REDUCTION_MODE_MAX as a result of this command must have a VkImageViewType and format that supports cubic filtering together with minmax filtering, as specified by VkFilterCubicImageViewImageFormatPropertiesEXT::filterCubicMinmax returned by vkGetPhysicalDeviceImageFormatProperties2", 414}, { "chapters/raytracing.html", 24} } },
         { {"VUID-vkCmdTraceRaysIndirect2KHR-flags-02696", 43}, { {"Any VkImage created with a VkImageCreateInfo::flags containing VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV sampled as a result of this command must only be sampled using a VkSamplerAddressMode of VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE", 227}, { "chapters/raytracing.html", 24} } },
         { {"VUID-vkCmdTraceRaysIndirect2KHR-format-07753", 44}, { {"If a VkImageView or VkBufferView is accessed as a result of this command, then the numeric type of the view's format and the Sampled Type operand of the OpTypeImage must match", 175}, { "chapters/raytracing.html", 24} } },
+        { {"VUID-vkCmdTraceRaysIndirect2KHR-imageLayout-00344", 49}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/raytracing.html", 24} } },
         { {"VUID-vkCmdTraceRaysIndirect2KHR-indirectDeviceAddress-03633", 59}, { {"The buffer from which indirectDeviceAddress was queried must have been created with the VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT bit set", 131}, { "chapters/raytracing.html", 24} } },
         { {"VUID-vkCmdTraceRaysIndirect2KHR-indirectDeviceAddress-03634", 59}, { {"indirectDeviceAddress must be a multiple of 4", 45}, { "chapters/raytracing.html", 24} } },
         { {"VUID-vkCmdTraceRaysIndirect2KHR-indirectDeviceAddress-03636", 59}, { {"All device addresses between indirectDeviceAddress and indirectDeviceAddress + sizeof(VkTraceRaysIndirectCommand2KHR) - 1 must be in the buffer device address range of the same buffer", 183}, { "chapters/raytracing.html", 24} } },
@@ -18396,6 +18427,7 @@
         { {"VUID-vkCmdTraceRaysIndirectKHR-flags-03696", 42}, { {"If the bound ray tracing pipeline was created with flags that included VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_CLOSEST_HIT_SHADERS_BIT_KHR, pHitShaderBindingTable->deviceAddress must not be zero", 193}, { "chapters/raytracing.html", 24} } },
         { {"VUID-vkCmdTraceRaysIndirectKHR-flags-03697", 42}, { {"If the bound ray tracing pipeline was created with flags that included VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_INTERSECTION_SHADERS_BIT_KHR, pHitShaderBindingTable->deviceAddress must not be zero", 194}, { "chapters/raytracing.html", 24} } },
         { {"VUID-vkCmdTraceRaysIndirectKHR-format-07753", 43}, { {"If a VkImageView or VkBufferView is accessed as a result of this command, then the numeric type of the view's format and the Sampled Type operand of the OpTypeImage must match", 175}, { "chapters/raytracing.html", 24} } },
+        { {"VUID-vkCmdTraceRaysIndirectKHR-imageLayout-00344", 48}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/raytracing.html", 24} } },
         { {"VUID-vkCmdTraceRaysIndirectKHR-indirectDeviceAddress-03633", 58}, { {"The buffer from which indirectDeviceAddress was queried must have been created with the VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT bit set", 131}, { "chapters/raytracing.html", 24} } },
         { {"VUID-vkCmdTraceRaysIndirectKHR-indirectDeviceAddress-03634", 58}, { {"indirectDeviceAddress must be a multiple of 4", 45}, { "chapters/raytracing.html", 24} } },
         { {"VUID-vkCmdTraceRaysIndirectKHR-indirectDeviceAddress-03636", 58}, { {"All device addresses between indirectDeviceAddress and indirectDeviceAddress + sizeof(VkTraceRaysIndirectCommandKHR) - 1 must be in the buffer device address range of the same buffer", 182}, { "chapters/raytracing.html", 24} } },
@@ -18512,6 +18544,7 @@
         { {"VUID-vkCmdTraceRaysKHR-flags-03697", 34}, { {"If the bound ray tracing pipeline was created with flags that included VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_INTERSECTION_SHADERS_BIT_KHR, pHitShaderBindingTable->deviceAddress must not be zero", 194}, { "chapters/raytracing.html", 24} } },
         { {"VUID-vkCmdTraceRaysKHR-format-07753", 35}, { {"If a VkImageView or VkBufferView is accessed as a result of this command, then the numeric type of the view's format and the Sampled Type operand of the OpTypeImage must match", 175}, { "chapters/raytracing.html", 24} } },
         { {"VUID-vkCmdTraceRaysKHR-height-03639", 35}, { {"height must be less than or equal to VkPhysicalDeviceLimits::maxComputeWorkGroupCount[1] x VkPhysicalDeviceLimits::maxComputeWorkGroupSize[1]", 141}, { "chapters/raytracing.html", 24} } },
+        { {"VUID-vkCmdTraceRaysKHR-imageLayout-00344", 40}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/raytracing.html", 24} } },
         { {"VUID-vkCmdTraceRaysKHR-magFilter-04553", 38}, { {"If a VkSampler created with magFilter or minFilter equal to VK_FILTER_LINEAR, reductionMode equal to VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE, and compareEnable equal to VK_FALSE is used to sample a VkImageView as a result of this command, then the image view's format features must contain VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT", 342}, { "chapters/raytracing.html", 24} } },
         { {"VUID-vkCmdTraceRaysKHR-magFilter-09598", 38}, { {"If a VkSampler created with magFilter or minFilter equal to VK_FILTER_LINEAR and reductionMode equal to either VK_SAMPLER_REDUCTION_MODE_MIN or VK_SAMPLER_REDUCTION_MODE_MAX is used to sample a VkImageView as a result of this command, then the image view's format features must contain VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_MINMAX_BIT", 335}, { "chapters/raytracing.html", 24} } },
         { {"VUID-vkCmdTraceRaysKHR-maintenance4-08602", 41}, { {"If the maintenance4 feature is not enabled, then for each push constant that is statically used by a bound shader, a push constant value must have been set for the same pipeline bind point, with a VkPipelineLayout that is compatible for push constants, with the VkPipelineLayout used to create the current VkPipeline or the VkDescriptorSetLayout and VkPushConstantRange arrays used to create the current VkShaderEXT , as described in Pipeline Layout Compatibility", 463}, { "chapters/raytracing.html", 24} } },
@@ -18631,6 +18664,7 @@
         { {"VUID-vkCmdTraceRaysNV-hitShaderBindingStride-02467", 50}, { {"hitShaderBindingStride must be less than or equal to VkPhysicalDeviceRayTracingPropertiesNV::maxShaderGroupStride", 113}, { "chapters/raytracing.html", 24} } },
         { {"VUID-vkCmdTraceRaysNV-hitShaderBindingTableBuffer-04044", 55}, { {"If hitShaderBindingTableBuffer is non-sparse then it must be bound completely and contiguously to a single VkDeviceMemory object", 128}, { "chapters/raytracing.html", 24} } },
         { {"VUID-vkCmdTraceRaysNV-hitShaderBindingTableBuffer-parameter", 59}, { {"If hitShaderBindingTableBuffer is not VK_NULL_HANDLE, hitShaderBindingTableBuffer must be a valid VkBuffer handle", 113}, { "chapters/raytracing.html", 24} } },
+        { {"VUID-vkCmdTraceRaysNV-imageLayout-00344", 39}, { {"If an image descriptor is accessed by a shader, the VkImageLayout must match the subresource accessible from the VkImageView as defined by the image layout matching rules", 170}, { "chapters/raytracing.html", 24} } },
         { {"VUID-vkCmdTraceRaysNV-magFilter-04553", 37}, { {"If a VkSampler created with magFilter or minFilter equal to VK_FILTER_LINEAR, reductionMode equal to VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE, and compareEnable equal to VK_FALSE is used to sample a VkImageView as a result of this command, then the image view's format features must contain VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT", 342}, { "chapters/raytracing.html", 24} } },
         { {"VUID-vkCmdTraceRaysNV-magFilter-09598", 37}, { {"If a VkSampler created with magFilter or minFilter equal to VK_FILTER_LINEAR and reductionMode equal to either VK_SAMPLER_REDUCTION_MODE_MIN or VK_SAMPLER_REDUCTION_MODE_MAX is used to sample a VkImageView as a result of this command, then the image view's format features must contain VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_MINMAX_BIT", 335}, { "chapters/raytracing.html", 24} } },
         { {"VUID-vkCmdTraceRaysNV-maintenance4-08602", 40}, { {"If the maintenance4 feature is not enabled, then for each push constant that is statically used by a bound shader, a push constant value must have been set for the same pipeline bind point, with a VkPipelineLayout that is compatible for push constants, with the VkPipelineLayout used to create the current VkPipeline or the VkDescriptorSetLayout and VkPushConstantRange arrays used to create the current VkShaderEXT , as described in Pipeline Layout Compatibility", 463}, { "chapters/raytracing.html", 24} } },
diff --git a/scripts/known_good.json b/scripts/known_good.json
index 262e38d..47801b2 100644
--- a/scripts/known_good.json
+++ b/scripts/known_good.json
@@ -7,7 +7,7 @@
             "sub_dir": "Vulkan-Headers",
             "build_dir": "Vulkan-Headers/build",
             "install_dir": "Vulkan-Headers/build/install",
-            "commit": "v1.4.328"
+            "commit": "v1.4.329"
         },
         {
             "name": "Vulkan-Utility-Libraries",
@@ -15,7 +15,7 @@
             "sub_dir": "Vulkan-Utility-Libraries",
             "build_dir": "Vulkan-Utility-Libraries/build",
             "install_dir": "Vulkan-Utility-Libraries/build/install",
-            "commit": "v1.4.328",
+            "commit": "v1.4.329",
             "deps": [
                 {
                     "var_name": "VULKAN_HEADERS_INSTALL_DIR",
@@ -99,7 +99,7 @@
             "sub_dir": "Vulkan-Loader",
             "build_dir": "Vulkan-Loader/build",
             "install_dir": "Vulkan-Loader/build/install",
-            "commit": "v1.4.328",
+            "commit": "v1.4.329",
             "build_step": "skip",
             "optional": [
                 "tests"
diff --git a/tests/layers/VkLayer_device_profile_api.json.in b/tests/layers/VkLayer_device_profile_api.json.in
index 5764774..ede6deb 100644
--- a/tests/layers/VkLayer_device_profile_api.json.in
+++ b/tests/layers/VkLayer_device_profile_api.json.in
@@ -4,7 +4,7 @@
         "name": "VK_LAYER_LUNARG_device_profile_api",
         "type": "GLOBAL",
         "library_path": "@JSON_LIBRARY_PATH@",
-        "api_version": "1.4.328",
+        "api_version": "1.4.329",
         "implementation_version": "2",
         "description": "LunarG Device Profile Api Layer",
         "device_extensions": [