Check renderpass2 support in image clearing tests

This commit makes sure VK_KHR_create_renderpass2 is supported before
using it in some image clearing tests.

Affected tests:
dEQP-VK.api.image_clearing.*separate_layouts*

Components: Vulkan
VK-GL-CTS issue: 2101

Change-Id: Ib1a44b44f771bb31fd1ef798d2727370d143a1fa

diff --git a/external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp
index 33bfa6b..26aed40 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp
@@ -862,6 +862,10 @@ Move<VkRenderPass> ImageClearingTestInstance::createRenderPass (VkFormat format)
        }
        else
        {
+               // Make sure VK_KHR_create_renderpass2 is supported. Due to InstanceFactory1 being used and the render pass being created in
+               // the instance constructor and not every time, this is the best moment to check.
+               m_context.requireDeviceFunctionality("VK_KHR_create_renderpass2");
+
                VkImageLayout                                                           initialLayout                   = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
                VkImageLayout                                                           finalLayout                             = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
                VkAttachmentDescriptionStencilLayoutKHR         stencilLayouts                  =