diff options
| author | Dave Houlton <daveh@lunarg.com> | 2017-03-23 14:33:22 -0600 |
|---|---|---|
| committer | Dave Houlton <daveh@lunarg.com> | 2017-03-24 09:48:42 -0600 |
| commit | 75f2382e235cdac8f007be3f11a134a0a2a01080 (patch) | |
| tree | 4e5c000122037c96a71ec7f1af4749a61a37e0ac /tests | |
| parent | 95b7894efd5e101e410da92fc697429aec3ffa7b (diff) | |
tests: Fix UnexpectedError crashing on WinIntel
Fixed an error in RenderPassInUseDestroyedSignaled that was causing
a benign failure on most devices but throwing an exception on Intel
Windows driver.
Change-Id: I985429e1bf20f68710faf2012a201a18b4648939
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/layer_validation_tests.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp index b5a33ac0..966b5564 100644 --- a/tests/layer_validation_tests.cpp +++ b/tests/layer_validation_tests.cpp @@ -5191,6 +5191,7 @@ TEST_F(VkLayerTest, RenderPassInUseDestroyedSignaled) { VkAttachmentReference attach = {}; attach.layout = VK_IMAGE_LAYOUT_GENERAL; VkSubpassDescription subpass = {}; + subpass.colorAttachmentCount = 1; subpass.pColorAttachments = &attach; VkRenderPassCreateInfo rpci = {}; rpci.subpassCount = 1; @@ -5268,16 +5269,15 @@ TEST_F(VkLayerTest, RenderPassInUseDestroyedSignaled) { VkPipelineCacheCreateInfo pc_ci = {}; pc_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO; + m_errorMonitor->ExpectSuccess(); VkPipeline pipeline; VkPipelineCache pipe_cache; err = vkCreatePipelineCache(m_device->device(), &pc_ci, NULL, &pipe_cache); ASSERT_VK_SUCCESS(err); - m_errorMonitor->SetUnexpectedError( - "If pColorBlendState is not NULL, The attachmentCount member of pColorBlendState must be equal to the colorAttachmentCount " - "used to create subpass"); err = vkCreateGraphicsPipelines(m_device->device(), pipe_cache, 1, &gp_ci, NULL, &pipeline); ASSERT_VK_SUCCESS(err); + // Bind pipeline to cmd buffer, will also bind renderpass m_commandBuffer->BeginCommandBuffer(); vkCmdBindPipeline(m_commandBuffer->GetBufferHandle(), VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline); @@ -5288,6 +5288,7 @@ TEST_F(VkLayerTest, RenderPassInUseDestroyedSignaled) { submit_info.commandBufferCount = 1; submit_info.pCommandBuffers = &m_commandBuffer->handle(); vkQueueSubmit(m_device->m_queue, 1, &submit_info, VK_NULL_HANDLE); + m_errorMonitor->VerifyNotFound(); m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, VALIDATION_ERROR_00393); vkDestroyRenderPass(m_device->device(), rp, nullptr); |