Move VVL suppressions

Suppress more of the VVL errors in order to get the roll passing.

Bug: 381887313
Change-Id: I3e1ba3beca13b84fa6810080654b6ab06a8bedfb
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/218314
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dan sinclair <dsinclair@chromium.org>
Auto-Submit: dan sinclair <dsinclair@chromium.org>
diff --git a/src/dawn/native/vulkan/BackendVk.cpp b/src/dawn/native/vulkan/BackendVk.cpp
index 025862f..409dfe7 100644
--- a/src/dawn/native/vulkan/BackendVk.cpp
+++ b/src/dawn/native/vulkan/BackendVk.cpp
@@ -176,19 +176,23 @@
 
     // https://crbug.com/381887313
     {"VUID-VkPipelineLayoutCreateInfo-descriptorType-03022",
-     "max per-stage sampler bindings count (1) exceeds device "
-     "maxPerStageDescriptorUpdateAfterBindSamplers limit (0)"},
+     "exceeds device maxPerStageDescriptorUpdateAfterBindSamplers limit (0)"},
     {"VUID-VkPipelineLayoutCreateInfo-descriptorType-03023",
      "maxPerStageDescriptorUpdateAfterBindUniformBuffers limit (0)"},
     {"VUID-VkPipelineLayoutCreateInfo-descriptorType-03024",
-     "max per-stage storage buffer bindings count (1) exceeds device "
-     "maxPerStageDescriptorUpdateAfterBindStorageBuffers limit (0)"},
+     "exceeds device maxPerStageDescriptorUpdateAfterBindStorageBuffers limit (0)"},
     {"VUID-VkPipelineLayoutCreateInfo-descriptorType-03025",
-     "max per-stage sampled image bindings count (1) exceeds device "
-     "maxPerStageDescriptorUpdateAfterBindSampledImages limit (0)"},
+     "exceeds device maxPerStageDescriptorUpdateAfterBindSampledImages limit (0)"},
+    {"VUID-VkPipelineLayoutCreateInfo-pSetLayouts-03036",
+     "exceeds device maxDescriptorSetUpdateAfterBindSamplers limit (0)"},
     {"VUID-VkPipelineLayoutCreateInfo-pSetLayouts-03037",
-     "sum of uniform buffer bindings among all stages (4) exceeds device "
-     "maxDescriptorSetUpdateAfterBindUniformBuffers limit (0)"},
+     "exceeds device maxDescriptorSetUpdateAfterBindUniformBuffers limit (0)"},
+    {"VUID-VkPipelineLayoutCreateInfo-pSetLayouts-03038",
+     "exceeds device maxDescriptorSetUpdateAfterBindUniformBuffersDynamic limit (0)"},
+    {"VUID-VkPipelineLayoutCreateInfo-pSetLayouts-03039",
+     "exceeds device maxDescriptorSetUpdateAfterBindStorageBuffers limit (0)"},
+    {"VUID-VkPipelineLayoutCreateInfo-pSetLayouts-03041",
+     "exceeds device maxDescriptorSetUpdateAfterBindSampledImages limit (0)"},
 };
 
 namespace dawn::native::vulkan {