diff --git a/src/VmaReplay/Constants.cpp b/src/VmaReplay/Constants.cpp
index 44b4748..9f19d13 100644
--- a/src/VmaReplay/Constants.cpp
+++ b/src/VmaReplay/Constants.cpp
@@ -80,7 +80,7 @@
     "VK_BUFFER_USAGE_VERTEX_BUFFER_BIT",
     "VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT",
     "VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT",
-    "VK_BUFFER_USAGE_RAYTRACING_BIT_NVX",
+    //"VK_BUFFER_USAGE_RAYTRACING_BIT_NVX",
 };
 const uint32_t VK_BUFFER_USAGE_FLAG_VALUES[] = {
     VK_BUFFER_USAGE_TRANSFER_SRC_BIT,
@@ -93,7 +93,7 @@
     VK_BUFFER_USAGE_VERTEX_BUFFER_BIT,
     VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT,
     VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT,
-    VK_BUFFER_USAGE_RAYTRACING_BIT_NVX,
+    //VK_BUFFER_USAGE_RAYTRACING_BIT_NVX,
 };
 const size_t VK_BUFFER_USAGE_FLAG_COUNT = _countof(VK_BUFFER_USAGE_FLAG_NAMES);
 static_assert(
@@ -119,7 +119,7 @@
     "VK_IMAGE_CREATE_EXTENDED_USAGE_BIT",
     "VK_IMAGE_CREATE_PROTECTED_BIT",
     "VK_IMAGE_CREATE_DISJOINT_BIT",
-    "VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV",
+    //"VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV",
     "VK_IMAGE_CREATE_SAMPLE_LOCATIONS_COMPATIBLE_DEPTH_BIT_EXT",
 };
 const uint32_t VK_IMAGE_CREATE_FLAG_VALUES[] = {
@@ -135,7 +135,7 @@
     VK_IMAGE_CREATE_EXTENDED_USAGE_BIT,
     VK_IMAGE_CREATE_PROTECTED_BIT,
     VK_IMAGE_CREATE_DISJOINT_BIT,
-    VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV,
+    //VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV,
     VK_IMAGE_CREATE_SAMPLE_LOCATIONS_COMPATIBLE_DEPTH_BIT_EXT,
 };
 const size_t VK_IMAGE_CREATE_FLAG_COUNT = _countof(VK_IMAGE_CREATE_FLAG_NAMES);
@@ -651,7 +651,7 @@
     "VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT",
     "VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT",
     "VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT",
-    "VK_IMAGE_USAGE_SHADING_RATE_IMAGE_BIT_NV",
+    //"VK_IMAGE_USAGE_SHADING_RATE_IMAGE_BIT_NV",
 };
 const uint32_t VK_IMAGE_USAGE_FLAG_VALUES[] = {
     VK_IMAGE_USAGE_TRANSFER_SRC_BIT,
@@ -662,7 +662,7 @@
     VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT,
     VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT,
     VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT,
-    VK_IMAGE_USAGE_SHADING_RATE_IMAGE_BIT_NV,
+    //VK_IMAGE_USAGE_SHADING_RATE_IMAGE_BIT_NV,
 };
 const size_t VK_IMAGE_USAGE_FLAG_COUNT = _countof(VK_IMAGE_USAGE_FLAG_NAMES);
 static_assert(
@@ -683,7 +683,7 @@
     "VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL",
     "VK_IMAGE_LAYOUT_PRESENT_SRC_KHR",
     "VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR",
-    "VK_IMAGE_LAYOUT_SHADING_RATE_OPTIMAL_NV",
+    //"VK_IMAGE_LAYOUT_SHADING_RATE_OPTIMAL_NV",
 };
 const uint32_t VK_IMAGE_LAYOUT_VALUES[] = {
     VK_IMAGE_LAYOUT_UNDEFINED,
@@ -699,7 +699,7 @@
     VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL,
     VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
     VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR,
-    VK_IMAGE_LAYOUT_SHADING_RATE_OPTIMAL_NV,
+    //VK_IMAGE_LAYOUT_SHADING_RATE_OPTIMAL_NV,
 };
 const size_t VK_IMAGE_LAYOUT_COUNT = _countof(VK_IMAGE_LAYOUT_NAMES);
 static_assert(