Revert "tests: Fixing incorrect change w/GH424Rework"
This reverts commit c11756ae28cadb604e652232da2d7cf7124cee05.
Bad rebase -- this trashed some previous changes.
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 2925800..9b9f088 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -2498,7 +2498,7 @@
// before successfully creating a surface:
// First, try to create a surface without a VkXcbSurfaceCreateInfoKHR:
m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT,
- "called with NULL pointer");
+ "required parameter pCreateInfo specified as NULL");
err = vkCreateXcbSurfaceKHR(instance(), NULL, NULL, &surface);
pass = (err != VK_SUCCESS);
ASSERT_TRUE(pass);
@@ -2509,7 +2509,7 @@
VkXcbSurfaceCreateInfoKHR xcb_create_info = {};
xcb_create_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT,
- "called with the wrong value for");
+ "parameter pCreateInfo->sType must be");
err = vkCreateXcbSurfaceKHR(instance(), &xcb_create_info, NULL, &surface);
pass = (err != VK_SUCCESS);
ASSERT_TRUE(pass);
@@ -2640,7 +2640,8 @@
// First, try without a pointer to surface_format_count:
m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT,
- "called with NULL pointer");
+ "required parameter pSurfaceFormatCount "
+ "specified as NULL");
vkGetPhysicalDeviceSurfaceFormatsKHR(gpu(), surface, NULL, NULL);
pass = (err == VK_SUCCESS);
ASSERT_TRUE(pass);
@@ -2694,7 +2695,9 @@
// First, try without a pointer to surface_format_count:
m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT,
- "called with NULL pointer");
+ "required parameter pPresentModeCount "
+ "specified as NULL");
+
vkGetPhysicalDeviceSurfacePresentModesKHR(gpu(), surface, NULL, NULL);
pass = (err == VK_SUCCESS);
ASSERT_TRUE(pass);
@@ -2747,7 +2750,9 @@
// First, try without a pointer to swapchain_create_info:
m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT,
- "called with NULL pointer");
+ "required parameter pCreateInfo "
+ "specified as NULL");
+
err = vkCreateSwapchainKHR(m_device->device(), NULL, NULL, &swapchain);
pass = (err != VK_SUCCESS);
ASSERT_TRUE(pass);
@@ -2757,7 +2762,8 @@
// sType:
swapchain_create_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT,
- "called with the wrong value for");
+ "parameter pCreateInfo->sType must be");
+
err = vkCreateSwapchainKHR(m_device->device(), &swapchain_create_info, NULL,
&swapchain);
pass = (err != VK_SUCCESS);
@@ -2769,7 +2775,9 @@
swapchain_create_info.pNext = NULL;
swapchain_create_info.flags = 0;
m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT,
- "called with NULL pointer");
+ "required parameter pSwapchain "
+ "specified as NULL");
+
err = vkCreateSwapchainKHR(m_device->device(), &swapchain_create_info, NULL,
NULL);
pass = (err != VK_SUCCESS);
@@ -12283,10 +12291,7 @@
img_barrier.newLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
img_barrier.image = image.handle();
img_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
-
- // QueueFamilyIndex must be VK_QUEUE_FAMILY_IGNORED, this verifies
- // that layer validation catches the case when it is not.
- img_barrier.dstQueueFamilyIndex = 0;
+ img_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
img_barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
img_barrier.subresourceRange.baseArrayLayer = 0;
img_barrier.subresourceRange.baseMipLevel = 0;
@@ -15675,6 +15680,14 @@
16, &blitRegion, VK_FILTER_LINEAR);
m_errorMonitor->VerifyFound();
+ // Look for NULL-blit warning
+ m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_WARNING_BIT_EXT,
+ "Offsets specify a zero-volume area.");
+ vkCmdBlitImage(m_commandBuffer->GetBufferHandle(), intImage1.handle(),
+ intImage1.layout(), intImage2.handle(), intImage2.layout(),
+ 1, &blitRegion, VK_FILTER_LINEAR);
+ m_errorMonitor->VerifyFound();
+
m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT,
"called with 0 in ppMemoryBarriers");
VkImageMemoryBarrier img_barrier;