Merge vk-gl-cts/vulkan-cts-1.1.2 into vk-gl-cts/master

Change-Id: If79a2a85ad925402ffcb1f385157d128970d8b65

diff --git a/external/vulkancts/modules/vulkan/vktExternalMemoryUtil.cpp b/external/vulkancts/modules/vulkan/vktExternalMemoryUtil.cpp
index 161de5d..8261785 100644 (file)
--- a/external/vulkancts/modules/vulkan/vktExternalMemoryUtil.cpp
+++ b/external/vulkancts/modules/vulkan/vktExternalMemoryUtil.cpp
@@ -1501,8 +1501,8 @@ AndroidHardwareBufferExternalApi* AndroidHardwareBufferExternalApi::getInstance(
                static AndroidHardwareBufferExternalApi28 api28Instance;
                return &api28Instance;
        }
-       else
-#  elif defined(__ANDROID_API_O__) && (DE_ANDROID_API >= __ANDROID_API_O__)
+#  endif
+#  if defined(__ANDROID_API_O__) && (DE_ANDROID_API >= __ANDROID_API_O__)
        if (sdkVersion >= __ANDROID_API_O__ )
        {
                static AndroidHardwareBufferExternalApi26 api26Instance;

diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiIncrementalPresentTests.cpp b/external/vulkancts/modules/vulkan/wsi/vktWsiIncrementalPresentTests.cpp
index f0cca4e..c367554 100644 (file)
--- a/external/vulkancts/modules/vulkan/wsi/vktWsiIncrementalPresentTests.cpp
+++ b/external/vulkancts/modules/vulkan/wsi/vktWsiIncrementalPresentTests.cpp
@@ -716,7 +716,7 @@ std::vector<vk::VkSwapchainCreateInfoKHR> generateSwapchainConfigs (vk::VkSurfac
                                                                                                                                        vk::VkPresentModeKHR                                    presentMode)
 {
        const deUint32                                                  imageLayers                     = 1u;
-       const vk::VkImageUsageFlags                             imageUsage                      = properties.supportedUsageFlags;
+       const vk::VkImageUsageFlags                             imageUsage                      = vk::VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
        const vk::VkBool32                                              clipped                         = VK_FALSE;
        vector<vk::VkSwapchainCreateInfoKHR>    createInfos;