From 364f7e320f2cf8b1c83c23d02ff503429461e094 Mon Sep 17 00:00:00 2001
From: Sergey Yablokov <yablokovsergey1@gmail.com>
Date: Wed, 20 Nov 2024 01:36:57 +0100
Subject: [PATCH] Ignore false positive validation error  (happens with newer
 SDK)

---
 .github/workflows/ci.yml  |  2 +-
 internal/Vk/ContextVK.cpp |  2 +-
 internal/Vk/ContextVK.h   | 24 ++++++++++++------------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 02324030..95bf828a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -123,7 +123,7 @@ jobs:
         with:
           bin-dir: "windows-x86_64"
           out-dir: "windows-x86_64-gpu-nv-output"
-          test-args: "--device NV --nocpu -vl 0"
+          test-args: "--device NV --nocpu"
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         if: always()
diff --git a/internal/Vk/ContextVK.cpp b/internal/Vk/ContextVK.cpp
index b43eee0e..862ad26a 100644
--- a/internal/Vk/ContextVK.cpp
+++ b/internal/Vk/ContextVK.cpp
@@ -29,8 +29,8 @@ VKAPI_ATTR VkBool32 VKAPI_CALL DebugReportCallback(const VkDebugReportFlagsEXT f
     auto *ctx = reinterpret_cast<const Context *>(pUserData);
 
     bool ignore = g_ignore_optick_errors && (location == 0x45e90123 || location == 0xffffffff9cacd67a);
-    ignore |= (location == 0x0000000079de34d4); // dynamic rendering support is incomplete
     ignore |= (location == 0x000000004dae5635); // layout warning when blitting within the same image
+    ignore |= (location == 0x00000000a5625282); // cooperative matrix type must be A Type
     if (!ignore) {
         ctx->log()->Error("%s: %s\n", pLayerPrefix, pMessage);
     }
diff --git a/internal/Vk/ContextVK.h b/internal/Vk/ContextVK.h
index 6ee39370..bd0a5449 100644
--- a/internal/Vk/ContextVK.h
+++ b/internal/Vk/ContextVK.h
@@ -128,18 +128,18 @@ class Context {
     bool frame_cpu_synced[MaxFramesInFlight] = {};
 
     // resources scheduled for deferred destruction
-    SmallVector<VkImage, 128> images_to_destroy[MaxFramesInFlight];
-    SmallVector<VkImageView, 128> image_views_to_destroy[MaxFramesInFlight];
-    SmallVector<VkSampler, 128> samplers_to_destroy[MaxFramesInFlight];
-    SmallVector<MemAllocation, 128> allocs_to_free[MaxFramesInFlight];
-    SmallVector<VkBuffer, 128> bufs_to_destroy[MaxFramesInFlight];
-    SmallVector<VkBufferView, 128> buf_views_to_destroy[MaxFramesInFlight];
-    SmallVector<VkDeviceMemory, 128> mem_to_free[MaxFramesInFlight];
-    SmallVector<VkRenderPass, 128> render_passes_to_destroy[MaxFramesInFlight];
-    SmallVector<VkDescriptorPool, 16> descriptor_pools_to_destroy[MaxFramesInFlight];
-    SmallVector<VkPipelineLayout, 128> pipeline_layouts_to_destroy[MaxFramesInFlight];
-    SmallVector<VkPipeline, 128> pipelines_to_destroy[MaxFramesInFlight];
-    SmallVector<VkAccelerationStructureKHR, 128> acc_structs_to_destroy[MaxFramesInFlight];
+    std::vector<VkImage> images_to_destroy[MaxFramesInFlight];
+    std::vector<VkImageView> image_views_to_destroy[MaxFramesInFlight];
+    std::vector<VkSampler> samplers_to_destroy[MaxFramesInFlight];
+    std::vector<MemAllocation> allocs_to_free[MaxFramesInFlight];
+    std::vector<VkBuffer> bufs_to_destroy[MaxFramesInFlight];
+    std::vector<VkBufferView> buf_views_to_destroy[MaxFramesInFlight];
+    std::vector<VkDeviceMemory> mem_to_free[MaxFramesInFlight];
+    std::vector<VkRenderPass> render_passes_to_destroy[MaxFramesInFlight];
+    std::vector<VkDescriptorPool> descriptor_pools_to_destroy[MaxFramesInFlight];
+    std::vector<VkPipelineLayout> pipeline_layouts_to_destroy[MaxFramesInFlight];
+    std::vector<VkPipeline> pipelines_to_destroy[MaxFramesInFlight];
+    std::vector<VkAccelerationStructureKHR> acc_structs_to_destroy[MaxFramesInFlight];
 
     static int QueryAvailableDevices(ILog *log, gpu_device_t out_devices[], int capacity);