commit 4cf5bd3db9e14bd449d32e8b256b32849247f61e
author Tony Barbour <tony@LunarG.com> Fri Aug 12 14:53:58 2016 -0600
committer Tony Barbour <tony@LunarG.com> Thu Aug 18 10:30:04 2016 -0600
tree bf5459ad9c2dbc35af32f13606fe4abd926b33ae
parent 6695fa4b0f4cbfcc900e6455f86ac119ef976986

tests: Change IndependentBlend test to use new InitState parm

Change-Id: Ied23b9241a6e093b66c76605f84481e33ebb2583

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 7dbe90c..45709a8 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -4267,53 +4267,35 @@
     TEST_DESCRIPTION("Generate INDEPENDENT_BLEND by disabling independent "
                      "blend and then specifying different blend states for two "
                      "attachements");
-    ASSERT_NO_FATAL_FAILURE(InitState());
-
-    m_errorMonitor->SetDesiredFailureMsg(
-        VK_DEBUG_REPORT_ERROR_BIT_EXT,
-        "Invalid Pipeline CreateInfo: If independent blend feature not "
-        "enabled, all elements of pAttachments must be identical");
     VkPhysicalDeviceFeatures features = {};
     features.independentBlend = VK_FALSE;
-    std::vector<const char *> extension_names;
-    VkDeviceObj noib_device(0, gpu(), extension_names, &features);
+    ASSERT_NO_FATAL_FAILURE(InitState(&features));
 
-    VkCommandPool cmd_pool;
-    VkCommandPoolCreateInfo pool_create_info{};
-    pool_create_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO;
-    pool_create_info.queueFamilyIndex = noib_device.graphics_queue_node_index_;
-    pool_create_info.flags = VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT;
+    m_errorMonitor->SetDesiredFailureMsg(
+                VK_DEBUG_REPORT_ERROR_BIT_EXT,
+                "Invalid Pipeline CreateInfo: If independent blend feature not "
+                "enabled, all elements of pAttachments must be identical");
 
-    vkCreateCommandPool(noib_device.device(), &pool_create_info, nullptr,
-                        &cmd_pool);
-    {
-        // Need cmd_buffer's destructor to be called before calling DestroyCommandPool
-        VkCommandBufferObj cmd_buffer(&noib_device, cmd_pool);
-        VkDescriptorSetObj descriptorSet(&noib_device);
-        descriptorSet.AppendDummy();
-        descriptorSet.CreateVKDescriptorSet(&cmd_buffer);
+    VkDescriptorSetObj descriptorSet(m_device);
+    descriptorSet.AppendDummy();
+    descriptorSet.CreateVKDescriptorSet(m_commandBuffer);
 
-        VkPipelineObj pipeline(&noib_device);
+    VkPipelineObj pipeline(m_device);
+    VkRenderpassObj renderpass(m_device);
+    VkShaderObj vs(m_device, bindStateVertShaderText,
+                   VK_SHADER_STAGE_VERTEX_BIT, this);
+    pipeline.AddShader(&vs);
 
-        VkRenderpassObj renderpass(&noib_device);
-
-        VkShaderObj vs(&noib_device, bindStateVertShaderText,
-                       VK_SHADER_STAGE_VERTEX_BIT, this);
-
-        pipeline.AddShader(&vs);
-
-        VkPipelineColorBlendAttachmentState att_state1 = {}, att_state2 = {};
-        att_state1.dstAlphaBlendFactor = VK_BLEND_FACTOR_CONSTANT_COLOR;
-        att_state1.blendEnable = VK_TRUE;
-        att_state2.dstAlphaBlendFactor = VK_BLEND_FACTOR_CONSTANT_COLOR;
-        att_state2.blendEnable = VK_FALSE;
-        pipeline.AddColorAttachment(0, &att_state1);
-        pipeline.AddColorAttachment(1, &att_state2);
-        pipeline.CreateVKPipeline(descriptorSet.GetPipelineLayout(),
-                                  renderpass.handle());
-        m_errorMonitor->VerifyFound();
-    }
-    vkDestroyCommandPool(noib_device.device(), cmd_pool, NULL);
+    VkPipelineColorBlendAttachmentState att_state1 = {}, att_state2 = {};
+    att_state1.dstAlphaBlendFactor = VK_BLEND_FACTOR_CONSTANT_COLOR;
+    att_state1.blendEnable = VK_TRUE;
+    att_state2.dstAlphaBlendFactor = VK_BLEND_FACTOR_CONSTANT_COLOR;
+    att_state2.blendEnable = VK_FALSE;
+    pipeline.AddColorAttachment(0, &att_state1);
+    pipeline.AddColorAttachment(1, &att_state2);
+    pipeline.CreateVKPipeline(descriptorSet.GetPipelineLayout(),
+                              renderpass.handle());
+    m_errorMonitor->VerifyFound();
 }
 
 TEST_F(VkLayerTest, RenderPassDepthStencilAttachmentUnused) {