From 98727170fa740ecf7200e4af0b40e9ee6a6732b9 Mon Sep 17 00:00:00 2001 From: Shannon McPherson Date: Fri, 19 Jun 2020 14:35:58 -0600 Subject: [PATCH] build: Fix more VUID changes for 144 header update VUID-VkBufferMemoryBarrier-buffer-01193 and VUID-VkImageMemoryBarrier-image-01201 were removed Change-Id: Icb739d96e45dd3dc7cdbadef9638ad518257cdf8 --- layers/core_validation.cpp | 3 --- tests/vklayertests_buffer_image_memory_sampler.cpp | 9 --------- 2 files changed, 12 deletions(-) diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 17b4cacba2d..2888c2850ca 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -6509,7 +6509,6 @@ namespace barrier_queue_families { enum VuIndex { kSrcOrDstMustBeIgnore, kSpecialOrIgnoreOnly, - kSrcIgnoreRequiresDstIgnore, kSrcAndDstValidOrSpecial, kSrcAndDestMustBeIgnore, kSrcAndDstBothValid, @@ -6527,7 +6526,6 @@ static const char *vu_summary[] = {"Source or destination queue family must be i static const std::string image_error_codes[] = { "VUID-VkImageMemoryBarrier-image-01381", // kSrcOrDstMustBeIgnore "VUID-VkImageMemoryBarrier-image-04071", // kSpecialOrIgnoreOnly - "VUID-VkImageMemoryBarrier-image-01201", // kSrcIgnoreRequiresDstIgnore "VUID-VkImageMemoryBarrier-image-04072", // kSrcAndDstValidOrSpecial "VUID-VkImageMemoryBarrier-image-01199", // kSrcAndDestMustBeIgnore "VUID-VkImageMemoryBarrier-image-04069", // kSrcAndDstBothValid @@ -6537,7 +6535,6 @@ static const std::string image_error_codes[] = { static const std::string buffer_error_codes[] = { "VUID-VkBufferMemoryBarrier-buffer-01191", // kSrcOrDstMustBeIgnore "VUID-VkBufferMemoryBarrier-buffer-04088", // kSpecialOrIgnoreOnly - "VUID-VkBufferMemoryBarrier-buffer-01193", // kSrcIgnoreRequiresDstIgnore "VUID-VkBufferMemoryBarrier-buffer-04089", // kSrcAndDstValidOrSpecial "VUID-VkBufferMemoryBarrier-buffer-01190", // kSrcAndDestMustBeIgnore "VUID-VkBufferMemoryBarrier-buffer-04086", // kSrcAndDstBothValid diff --git a/tests/vklayertests_buffer_image_memory_sampler.cpp b/tests/vklayertests_buffer_image_memory_sampler.cpp index 62d1652e14c..09c1302f61f 100644 --- a/tests/vklayertests_buffer_image_memory_sampler.cpp +++ b/tests/vklayertests_buffer_image_memory_sampler.cpp @@ -5901,15 +5901,6 @@ TEST_F(VkLayerTest, InvalidBarrierQueueFamilyWithMemExt) { BarrierQueueFamilyTestHelper excl_test(&test_context); excl_test.Init(nullptr); // no queue families means *exclusive* sharing mode. - // core_validation::barrier_queue_families::kSrcIgnoreRequiresDstIgnore - excl_test("VUID-VkImageMemoryBarrier-image-01201", "VUID-VkBufferMemoryBarrier-buffer-01193", VK_QUEUE_FAMILY_IGNORED, - submit_family); - excl_test("VUID-VkImageMemoryBarrier-image-01201", "VUID-VkBufferMemoryBarrier-buffer-01193", VK_QUEUE_FAMILY_IGNORED, - VK_QUEUE_FAMILY_EXTERNAL_KHR); - // true -> positive test - excl_test("VUID-VkImageMemoryBarrier-image-01201", "VUID-VkBufferMemoryBarrier-buffer-01193", VK_QUEUE_FAMILY_IGNORED, - VK_QUEUE_FAMILY_IGNORED, true); - // core_validation::barrier_queue_families::kSrcAndDstValidOrSpecial excl_test("VUID-VkImageMemoryBarrier-image-04072", "VUID-VkBufferMemoryBarrier-buffer-04089", submit_family, invalid); excl_test("VUID-VkImageMemoryBarrier-image-04072", "VUID-VkBufferMemoryBarrier-buffer-04089", invalid, submit_family);