build: Reconcile VUIDs for 1.2.160 header
Change-Id: I6387732967a1eae2b37ac82aa70b65d2e3956b7e
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index 6b4b216..ea5e54b 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -9088,27 +9088,6 @@
function_name, error_type, string_VkImageLayout(reference.layout));
break;
- case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL:
- case VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL:
- case VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL:
- case VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL:
- if ((input == true) && ((reference.aspectMask & (VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_DEPTH_BIT)) == 0)) {
- skip |= LogError(device, "VUID-VkAttachmentReference2-attachment-03311",
- "%s: Layout for %s can't be %s because the current aspectMask (%x) does not include "
- "VK_IMAGE_ASPECT_STENCIL_BIT or VK_IMAGE_ASPECT_DEPTH_BIT.",
- function_name, error_type, string_VkImageLayout(reference.layout), reference.aspectMask);
- }
- break;
-
- case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL:
- if ((input == true) && ((reference.aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) == 0)) {
- skip |= LogError(device, "VUID-VkAttachmentReference2-attachment-03312",
- "%s: Layout for %s can't be VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL because the current "
- "aspectMask (%x) does not include VK_IMAGE_ASPECT_COLOR_BIT.",
- function_name, error_type, reference.aspectMask);
- }
- break;
-
case VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL:
case VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL:
// This check doesn't rely on the aspect mask value
@@ -9141,33 +9120,6 @@
}
}
// clang-format on
-
- if (input == true) {
- if ((!attachment_reference_stencil_layout) &&
- ((reference.aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) ==
- (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) {
- skip |= LogError(device, "VUID-VkAttachmentReference2-attachment-03315",
- "%s: The layout for %s is %s but the pNext chain does not include a valid "
- "VkAttachmentReferenceStencilLayout instance.",
- function_name, error_type, string_VkImageLayout(reference.layout));
- } else if ((reference.aspectMask & VK_IMAGE_ASPECT_STENCIL_BIT) != 0) {
- skip |=
- LogError(device, "VUID-VkAttachmentReference2-attachment-03317",
- "%s: The aspectMask for %s is only VK_IMAGE_ASPECT_STENCIL_BIT so the layout (%s) must not be "
- "VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL or VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL.",
- function_name, error_type, string_VkImageLayout(reference.layout));
- }
- }
- break;
-
- case VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL:
- case VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL:
- if ((input == true) && ((reference.aspectMask & VK_IMAGE_ASPECT_DEPTH_BIT) != 0)) {
- skip |= LogError(device, "VUID-VkAttachmentReference2-attachment-03316",
- "%s: The aspectMask for %s is only VK_IMAGE_ASPECT_DEPTH_BIT so the layout (%s) must not be "
- "VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL or VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL.",
- function_name, error_type, string_VkImageLayout(reference.layout));
- }
break;
default:
@@ -9188,11 +9140,6 @@
"VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL, or VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL.",
function_name, error_type, string_VkImageLayout(reference.layout));
}
- if ((input == true) && ((reference.aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) != 0)) {
- skip |= LogError(device, "VUID-VkAttachmentReference2-attachment-03314",
- "%s: Layout for %s aspectMask include VK_IMAGE_ASPECT_COLOR_BIT but the layout is %s.",
- function_name, error_type, string_VkImageLayout(reference.layout));
- }
default:
break;
}
diff --git a/layers/drawdispatch.cpp b/layers/drawdispatch.cpp
index 9d9c7c9..c985a30 100644
--- a/layers/drawdispatch.cpp
+++ b/layers/drawdispatch.cpp
@@ -505,7 +505,7 @@
"VUID-vkCmdDrawIndirectByteCountEXT-None-02692",
"VUID-vkCmdDrawIndirectByteCountEXT-commandBuffer-02646",
"UNASSIGNED-vkCmdDrawIndirectByteCountEXT-buffer", // TODO - Update when header are updated
- "VUID-vkCmdDrawIndirectByteCountEXT-buffer-02290",
+ "VUID-vkCmdDrawIndirectByteCountEXT-counterBuffer-02290",
"VUID-vkCmdDrawIndirectByteCountEXT-viewportCount-03417",
"VUID-vkCmdDrawIndirectByteCountEXT-scissorCount-03418",
"VUID-vkCmdDrawIndirectByteCountEXT-viewportCount-03419",
diff --git a/layers/parameter_validation_utils.cpp b/layers/parameter_validation_utils.cpp
index 0926a58..07a424c 100644
--- a/layers/parameter_validation_utils.cpp
+++ b/layers/parameter_validation_utils.cpp
@@ -3880,13 +3880,6 @@
}
}
- if (firstExclusiveScissor >= device_limits.maxViewports) {
- skip |= LogError(commandBuffer, "VUID-vkCmdSetExclusiveScissorNV-firstExclusiveScissor-02033",
- "vkCmdSetExclusiveScissorNV: firstExclusiveScissor (=%" PRIu32
- ") must be less than maxViewports (=%" PRIu32 ").",
- firstExclusiveScissor, device_limits.maxViewports);
- }
-
if (pExclusiveScissors) {
for (uint32_t scissor_i = 0; scissor_i < exclusiveScissorCount; ++scissor_i) {
const auto &scissor = pExclusiveScissors[scissor_i]; // will crash on invalid ptr
@@ -3928,18 +3921,12 @@
uint32_t viewportCount,
const VkViewportWScalingNV *pViewportWScalings) const {
bool skip = false;
- if (firstViewport >= device_limits.maxViewports) {
- skip |= LogError(commandBuffer, "VUID-vkCmdSetViewportWScalingNV-firstViewport-01323",
- "vkCmdSetViewportWScalingNV: firstViewport (=%" PRIu32 ") must be less than maxViewports (=%" PRIu32 ").",
- firstViewport, device_limits.maxViewports);
- } else {
- const uint64_t sum = static_cast<uint64_t>(firstViewport) + static_cast<uint64_t>(viewportCount);
- if ((sum < 1) || (sum > device_limits.maxViewports)) {
- skip |= LogError(commandBuffer, "VUID-vkCmdSetViewportWScalingNV-firstViewport-01324",
- "vkCmdSetViewportWScalingNV: firstViewport + viewportCount (=%" PRIu32 " + %" PRIu32 " = %" PRIu64
- ") must be between 1 and VkPhysicalDeviceLimits::maxViewports (=%" PRIu32 "), inculsive.",
- firstViewport, viewportCount, sum, device_limits.maxViewports);
- }
+ const uint64_t sum = static_cast<uint64_t>(firstViewport) + static_cast<uint64_t>(viewportCount);
+ if ((sum < 1) || (sum > device_limits.maxViewports)) {
+ skip |= LogError(commandBuffer, "VUID-vkCmdSetViewportWScalingNV-firstViewport-01324",
+ "vkCmdSetViewportWScalingNV: firstViewport + viewportCount (=%" PRIu32 " + %" PRIu32 " = %" PRIu64
+ ") must be between 1 and VkPhysicalDeviceLimits::maxViewports (=%" PRIu32 "), inculsive.",
+ firstViewport, viewportCount, sum, device_limits.maxViewports);
}
return skip;
@@ -3967,13 +3954,6 @@
}
}
- if (firstViewport >= device_limits.maxViewports) {
- skip |= LogError(commandBuffer, "VUID-vkCmdSetViewportShadingRatePaletteNV-firstViewport-02066",
- "vkCmdSetViewportShadingRatePaletteNV: firstViewport (=%" PRIu32
- ") must be less than maxViewports (=%" PRIu32 ").",
- firstViewport, device_limits.maxViewports);
- }
-
const uint64_t sum = static_cast<uint64_t>(firstViewport) + static_cast<uint64_t>(viewportCount);
if (sum > device_limits.maxViewports) {
skip |= LogError(commandBuffer, "VUID-vkCmdSetViewportShadingRatePaletteNV-firstViewport-02067",
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 97b7d33..e16b4a9 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -260,9 +260,6 @@
safe_VkRenderPassCreateInfo2 create_info2;
ConvertVkRenderPassCreateInfoToV2KHR(*create_info, &create_info2);
- // aspectMasks might never get set in ConvertVkRenderPassCreateInfoToV2KHR
- error_monitor->SetUnexpectedError("VUID-VkAttachmentReference2-attachment-03311");
- error_monitor->SetUnexpectedError("VUID-VkAttachmentReference2-attachment-03312");
// Some tests mismatch attachment type with layout
error_monitor->SetUnexpectedError("VUID-VkSubpassDescription2-None-04439");
@@ -274,9 +271,6 @@
// For api version >= 1.2, try core entrypoint
PFN_vkCreateRenderPass2 vkCreateRenderPass2 = (PFN_vkCreateRenderPass2)vk::GetDeviceProcAddr(device, "vkCreateRenderPass2");
if (vkCreateRenderPass2) {
- // aspectMasks might never get set in ConvertVkRenderPassCreateInfoToV2KHR
- error_monitor->SetUnexpectedError("VUID-VkAttachmentReference2-attachment-03311");
- error_monitor->SetUnexpectedError("VUID-VkAttachmentReference2-attachment-03312");
// Some tests mismatch attachment type with layout
error_monitor->SetUnexpectedError("VUID-VkSubpassDescription2-None-04439");
diff --git a/tests/vklayertests_command.cpp b/tests/vklayertests_command.cpp
index 40f378c..d0f8c36 100644
--- a/tests/vklayertests_command.cpp
+++ b/tests/vklayertests_command.cpp
@@ -6537,10 +6537,6 @@
const auto max_vps = m_device->props.limits.maxViewports;
- m_errorMonitor->SetDesiredFailureMsg(kErrorBit, "VUID-vkCmdSetViewportWScalingNV-firstViewport-01323");
- vkCmdSetViewportWScalingNV(m_commandBuffer->handle(), max_vps, vp_count, scale.data());
- m_errorMonitor->VerifyFound();
-
m_errorMonitor->SetDesiredFailureMsg(kErrorBit, "VUID-vkCmdSetViewportWScalingNV-firstViewport-01324");
vkCmdSetViewportWScalingNV(m_commandBuffer->handle(), 1, max_vps, scale.data());
m_errorMonitor->VerifyFound();
diff --git a/tests/vklayertests_descriptor_renderpass_framebuffer.cpp b/tests/vklayertests_descriptor_renderpass_framebuffer.cpp
index db19fc9..90087a9 100644
--- a/tests/vklayertests_descriptor_renderpass_framebuffer.cpp
+++ b/tests/vklayertests_descriptor_renderpass_framebuffer.cpp
@@ -1112,129 +1112,6 @@
}
}
-TEST_F(VkLayerTest, RenderPassCreateInputAttachmentReferenceInvalidAspectMask) {
- TEST_DESCRIPTION("Input Attachment reference using invalid aspect mask");
-
- // Check for VK_KHR_get_physical_device_properties2
- if (InstanceExtensionSupported(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME)) {
- m_instance_extension_names.push_back(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME);
- }
-
- ASSERT_NO_FATAL_FAILURE(InitFramework(m_errorMonitor));
- bool rp2Supported = CheckCreateRenderPass2Support(this, m_device_extension_names);
- if (!rp2Supported) {
- printf("%s Extension %s is not supported.\n", kSkipPrefix, VK_KHR_CREATE_RENDERPASS_2_EXTENSION_NAME);
- return;
- }
-
- if (DeviceExtensionSupported(gpu(), nullptr, VK_KHR_SEPARATE_DEPTH_STENCIL_LAYOUTS_EXTENSION_NAME)) {
- m_device_extension_names.push_back(VK_KHR_SEPARATE_DEPTH_STENCIL_LAYOUTS_EXTENSION_NAME);
- }
- PFN_vkGetPhysicalDeviceFeatures2KHR vkGetPhysicalDeviceFeatures2KHR =
- (PFN_vkGetPhysicalDeviceFeatures2KHR)vk::GetInstanceProcAddr(instance(), "vkGetPhysicalDeviceFeatures2KHR");
- auto separate_depth_stencil_layouts_features = lvl_init_struct<VkPhysicalDeviceSeparateDepthStencilLayoutsFeaturesKHR>();
- auto features2 = lvl_init_struct<VkPhysicalDeviceFeatures2KHR>(&separate_depth_stencil_layouts_features);
- if (vkGetPhysicalDeviceFeatures2KHR) {
- vkGetPhysicalDeviceFeatures2KHR(gpu(), &features2);
- } else {
- separate_depth_stencil_layouts_features.separateDepthStencilLayouts = VK_FALSE;
- }
- ASSERT_NO_FATAL_FAILURE(InitState(nullptr, (vkGetPhysicalDeviceFeatures2KHR) ? &features2 : nullptr));
-
- const VkFormat ds_format = FindSupportedDepthStencilFormat(gpu());
-
- VkAttachmentDescription attach[] = {
- {0, VK_FORMAT_R8G8B8A8_UNORM, VK_SAMPLE_COUNT_1_BIT, VK_ATTACHMENT_LOAD_OP_DONT_CARE, VK_ATTACHMENT_STORE_OP_DONT_CARE,
- VK_ATTACHMENT_LOAD_OP_DONT_CARE, VK_ATTACHMENT_STORE_OP_DONT_CARE, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_GENERAL},
- {0, VK_FORMAT_R8G8B8A8_UNORM, VK_SAMPLE_COUNT_1_BIT, VK_ATTACHMENT_LOAD_OP_LOAD, VK_ATTACHMENT_STORE_OP_DONT_CARE,
- VK_ATTACHMENT_LOAD_OP_LOAD, VK_ATTACHMENT_STORE_OP_DONT_CARE, VK_IMAGE_LAYOUT_GENERAL, VK_IMAGE_LAYOUT_GENERAL},
- {0, ds_format, VK_SAMPLE_COUNT_1_BIT, VK_ATTACHMENT_LOAD_OP_LOAD, VK_ATTACHMENT_STORE_OP_DONT_CARE,
- VK_ATTACHMENT_LOAD_OP_LOAD, VK_ATTACHMENT_STORE_OP_DONT_CARE, VK_IMAGE_LAYOUT_GENERAL, VK_IMAGE_LAYOUT_GENERAL},
- };
- VkAttachmentReference refs[] = {
- {0, VK_IMAGE_LAYOUT_GENERAL}, // color
- {1, VK_IMAGE_LAYOUT_GENERAL}, // color input - pInputAttachments[0]
- {2, VK_IMAGE_LAYOUT_GENERAL}, // depth input - pInputAttachments[1]
- };
-
- // Because an input attachment in the first subpass doesn't make sense, first subpass is a dummy write to a color
- // Second subpass used to test having 2 input attachment, one for color and one for depth
- VkSubpassDescription subpasses[] = {
- {0, VK_PIPELINE_BIND_POINT_GRAPHICS, 0, nullptr, 1, &refs[0], nullptr, nullptr, 0, nullptr},
- {0, VK_PIPELINE_BIND_POINT_GRAPHICS, 2, &refs[1], 0, nullptr, nullptr, nullptr, 0, nullptr},
- };
-
- VkRenderPassCreateInfo rpci = {VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO, nullptr, 0, 3, attach, 2, subpasses, 0, nullptr};
-
- safe_VkRenderPassCreateInfo2 rpci2;
- ConvertVkRenderPassCreateInfoToV2KHR(rpci, &rpci2);
-
- rpci2.pSubpasses[1].pInputAttachments[0].aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
- rpci2.pSubpasses[1].pInputAttachments[0].layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
- m_errorMonitor->SetUnexpectedError("VUID-VkSubpassDescription2-None-04439");
- TestRenderPass2KHRCreate(m_errorMonitor, m_device->device(), rpci2.ptr(), "VUID-VkAttachmentReference2-attachment-03311");
- rpci2.pSubpasses[1].pInputAttachments[0].layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL;
- m_errorMonitor->SetUnexpectedError("VUID-VkSubpassDescription2-None-04439");
- TestRenderPass2KHRCreate(m_errorMonitor, m_device->device(), rpci2.ptr(), "VUID-VkAttachmentReference2-attachment-03311");
- rpci2.pSubpasses[1].pInputAttachments[0].layout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL;
- m_errorMonitor->SetUnexpectedError("VUID-VkSubpassDescription2-None-04439");
- TestRenderPass2KHRCreate(m_errorMonitor, m_device->device(), rpci2.ptr(), "VUID-VkAttachmentReference2-attachment-03311");
- rpci2.pSubpasses[1].pInputAttachments[0].layout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL;
- m_errorMonitor->SetUnexpectedError("VUID-VkSubpassDescription2-None-04439");
- TestRenderPass2KHRCreate(m_errorMonitor, m_device->device(), rpci2.ptr(), "VUID-VkAttachmentReference2-attachment-03311");
- rpci2.pSubpasses[1].pInputAttachments[0].layout = VK_IMAGE_LAYOUT_GENERAL; // reset
-
- rpci2.pSubpasses[1].pInputAttachments[1].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
- m_errorMonitor->SetUnexpectedError("VUID-VkSubpassDescription2-None-04439");
- TestRenderPass2KHRCreate(m_errorMonitor, m_device->device(), rpci2.ptr(), "VUID-VkAttachmentReference2-attachment-03312");
- rpci2.pSubpasses[1].pInputAttachments[1].layout = VK_IMAGE_LAYOUT_GENERAL; // reset
-
- if (separate_depth_stencil_layouts_features.separateDepthStencilLayouts) {
- rpci2.pSubpasses[1].pInputAttachments[0].layout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR;
- m_errorMonitor->SetUnexpectedError("VUID-VkSubpassDescription2-None-04439");
- TestRenderPass2KHRCreate(m_errorMonitor, m_device->device(), rpci2.ptr(), "VUID-VkAttachmentReference2-attachment-03314");
- rpci2.pSubpasses[1].pInputAttachments[0].layout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL_KHR;
- m_errorMonitor->SetUnexpectedError("VUID-VkSubpassDescription2-None-04439");
- TestRenderPass2KHRCreate(m_errorMonitor, m_device->device(), rpci2.ptr(), "VUID-VkAttachmentReference2-attachment-03314");
- rpci2.pSubpasses[1].pInputAttachments[0].layout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR;
- m_errorMonitor->SetUnexpectedError("VUID-VkSubpassDescription2-None-04439");
- TestRenderPass2KHRCreate(m_errorMonitor, m_device->device(), rpci2.ptr(), "VUID-VkAttachmentReference2-attachment-03314");
- rpci2.pSubpasses[1].pInputAttachments[0].layout = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL_KHR;
- m_errorMonitor->SetUnexpectedError("VUID-VkSubpassDescription2-None-04439");
- TestRenderPass2KHRCreate(m_errorMonitor, m_device->device(), rpci2.ptr(), "VUID-VkAttachmentReference2-attachment-03314");
-
- // reset to valid layout
- rpci2.pSubpasses[1].pInputAttachments[0].layout = VK_IMAGE_LAYOUT_GENERAL;
-
- rpci2.pSubpasses[1].pInputAttachments[1].aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT;
-
- rpci2.pSubpasses[1].pInputAttachments[1].layout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR;
- m_errorMonitor->SetUnexpectedError("VUID-VkSubpassDescription2-None-04439");
- TestRenderPass2KHRCreate(m_errorMonitor, m_device->device(), rpci2.ptr(), "VUID-VkAttachmentReference2-attachment-03315");
- rpci2.pSubpasses[1].pInputAttachments[1].layout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL_KHR;
- m_errorMonitor->SetUnexpectedError("VUID-VkSubpassDescription2-None-04439");
- TestRenderPass2KHRCreate(m_errorMonitor, m_device->device(), rpci2.ptr(), "VUID-VkAttachmentReference2-attachment-03315");
-
- rpci2.pSubpasses[1].pInputAttachments[1].aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT;
-
- rpci2.pSubpasses[1].pInputAttachments[1].layout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR;
- m_errorMonitor->SetUnexpectedError("VUID-VkSubpassDescription2-None-04439");
- TestRenderPass2KHRCreate(m_errorMonitor, m_device->device(), rpci2.ptr(), "VUID-VkAttachmentReference2-attachment-03316");
- rpci2.pSubpasses[1].pInputAttachments[1].layout = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL_KHR;
- m_errorMonitor->SetUnexpectedError("VUID-VkSubpassDescription2-None-04439");
- TestRenderPass2KHRCreate(m_errorMonitor, m_device->device(), rpci2.ptr(), "VUID-VkAttachmentReference2-attachment-03316");
-
- rpci2.pSubpasses[1].pInputAttachments[1].aspectMask = VK_IMAGE_ASPECT_STENCIL_BIT;
-
- rpci2.pSubpasses[1].pInputAttachments[1].layout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR;
- m_errorMonitor->SetUnexpectedError("VUID-VkSubpassDescription2-None-04439");
- TestRenderPass2KHRCreate(m_errorMonitor, m_device->device(), rpci2.ptr(), "VUID-VkAttachmentReference2-attachment-03317");
- rpci2.pSubpasses[1].pInputAttachments[1].layout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL_KHR;
- m_errorMonitor->SetUnexpectedError("VUID-VkSubpassDescription2-None-04439");
- TestRenderPass2KHRCreate(m_errorMonitor, m_device->device(), rpci2.ptr(), "VUID-VkAttachmentReference2-attachment-03317");
- }
-}
-
TEST_F(VkLayerTest, RenderPassCreateOverlappingCorrelationMasks) {
TEST_DESCRIPTION("Create a subpass with overlapping correlation masks");
diff --git a/tests/vklayertests_others.cpp b/tests/vklayertests_others.cpp
index b7c136c..782bad2 100644
--- a/tests/vklayertests_others.cpp
+++ b/tests/vklayertests_others.cpp
@@ -4780,7 +4780,6 @@
VkShadingRatePaletteNV palettes[] = {palette, palette};
// errors on firstViewport/viewportCount
- m_errorMonitor->SetDesiredFailureMsg(kErrorBit, "VUID-vkCmdSetViewportShadingRatePaletteNV-firstViewport-02066");
m_errorMonitor->SetDesiredFailureMsg(kErrorBit, "VUID-vkCmdSetViewportShadingRatePaletteNV-firstViewport-02067");
m_errorMonitor->SetDesiredFailureMsg(kErrorBit, "VUID-vkCmdSetViewportShadingRatePaletteNV-firstViewport-02068");
m_errorMonitor->SetDesiredFailureMsg(kErrorBit, "VUID-vkCmdSetViewportShadingRatePaletteNV-viewportCount-02069");
