Fix a couple of typos with separate_layout clearing tests

The VkAttachmentReferenceStencilLayoutKHR structure was using the
wrong sType and VkAttachmentDescriptionStencilLayoutKHR was
using the wrong stencil-only initial layout.

Affects:

dEQP-VK.api.image_clearing.*.clear_depth_stencil_image.*

Components: Vulkan

VK-GL-CTS issue: 2130

Change-Id: I33141f69d03a788faf1618ab0f75f37dbbe62950

diff --git a/external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp
index 26aed40..da0f1be 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp
@@ -879,7 +879,7 @@ Move<VkRenderPass> ImageClearingTestInstance::createRenderPass (VkFormat format)
                VkImageLayout                                                           imageLayout;
                VkAttachmentReferenceStencilLayoutKHR           stencilLayoutRef                =
                {
-                       VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT_KHR,
+                       VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT_KHR,
                        DE_NULL,
                        VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
                };
@@ -897,7 +897,7 @@ Move<VkRenderPass> ImageClearingTestInstance::createRenderPass (VkFormat format)
                {
                        initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
                        finalLayout = VK_IMAGE_LAYOUT_GENERAL;
-                       stencilLayouts.stencilInitialLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+                       stencilLayouts.stencilInitialLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR;
                        stencilLayouts.stencilFinalLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR;
                        imageLayout = VK_IMAGE_LAYOUT_GENERAL;
                        stencilLayoutRef.stencilLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR;