layers: Add valid usage enums to core_validation
Update valid usage enums in subsection of core validation from
validateEventStageMask() to validateSecondaryCommandBufferState(),
inclusive.
Update tests for vkCreateFramebuffer to work with refactored error
messages.
Change-Id: Ie6138fbfe7422b3a6affac45faeeb198a0ab6bcc
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 6e6da7a..c94e6d6 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -3516,15 +3516,38 @@
vkDestroyFramebuffer(m_device->device(), fb, NULL);
}
vkDestroyImageView(m_device->device(), view, NULL);
- // Request fb that exceeds max dimensions
// reset attachment to color attachment
fb_info.pAttachments = ivs;
+
+ // Request fb that exceeds max width
fb_info.width = m_device->props.limits.maxFramebufferWidth + 1;
+ fb_info.height = 100;
+ fb_info.layers = 1;
+ m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, VALIDATION_ERROR_00413);
+ err = vkCreateFramebuffer(device(), &fb_info, NULL, &fb);
+
+ m_errorMonitor->VerifyFound();
+ if (err == VK_SUCCESS) {
+ vkDestroyFramebuffer(m_device->device(), fb, NULL);
+ }
+
+ // Request fb that exceeds max height
+ fb_info.width = 100;
fb_info.height = m_device->props.limits.maxFramebufferHeight + 1;
+ fb_info.layers = 1;
+ m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, VALIDATION_ERROR_00414);
+ err = vkCreateFramebuffer(device(), &fb_info, NULL, &fb);
+
+ m_errorMonitor->VerifyFound();
+ if (err == VK_SUCCESS) {
+ vkDestroyFramebuffer(m_device->device(), fb, NULL);
+ }
+
+ // Request fb that exceeds max layers
+ fb_info.width = 100;
+ fb_info.height = 100;
fb_info.layers = m_device->props.limits.maxFramebufferLayers + 1;
- m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, " Requested VkFramebufferCreateInfo "
- "dimensions exceed physical device "
- "limits. ");
+ m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, VALIDATION_ERROR_00415);
err = vkCreateFramebuffer(device(), &fb_info, NULL, &fb);
m_errorMonitor->VerifyFound();