Fix regression in diff_attachments test

Fix issue introduced in ce82fe2a: use same image layout for
barrier newLayout and subsequent renderpass initialLayout.

Components: Vulkan

VK-GL_CTS Issue: 2568

Change-Id: I3118a7a2b1c7548fe669484f24414648b4cd246c
Affects: dEQP-VK.pipeline.framebuffer_attachment.diff_attachments_*
diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineFramebufferAttachmentTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineFramebufferAttachmentTests.cpp
index f525da1..50d6856 100644
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineFramebufferAttachmentTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineFramebufferAttachmentTests.cpp
@@ -962,7 +962,7 @@
 			VK_ATTACHMENT_STORE_OP_STORE,									// VkAttachmentStoreOp			storeOp;
 			VK_ATTACHMENT_LOAD_OP_DONT_CARE,								// VkAttachmentLoadOp			stencilLoadOp;
 			VK_ATTACHMENT_STORE_OP_DONT_CARE,								// VkAttachmentStoreOp			stencilStoreOp;
-			VK_IMAGE_LAYOUT_GENERAL,										// VkImageLayout				initialLayout;
+			VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,						// VkImageLayout				initialLayout;
 			VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,						// VkImageLayout				finalLayout;
 		};
 		attachmentDescriptions[i] = colorAttachmentDescription;