Merge vk-gl-cts/vulkan-cts-1.2.2 into vk-gl-cts/vulkan-cts-1.2.3

Change-Id: If1bb9f63d56815c3ced2ac72d17d4e55ec090f39

diff --cc external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
index 20c9fef,f30ca2f..eaf9ea3
--- 1/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
--- 2/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
@@@ -3992,20 -4013,6 +4014,9 @@@ tcu::TestStatus testAndroidHardwareBuff
        TestLog&                                                                          log                             = context.getTestContext().getLog();
        const vk::VkPhysicalDeviceLimits                          limits                          = getPhysicalDeviceProperties(vki, physicalDevice).limits;
  
-       vk::VkPhysicalDeviceProtectedMemoryFeatures             protectedFeatures;
-       protectedFeatures.sType                         = vk::VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES;
-       protectedFeatures.pNext                         = DE_NULL;
-       protectedFeatures.protectedMemory       = VK_FALSE;
- 
-       vk::VkPhysicalDeviceFeatures2                                   deviceFeatures;
-       deviceFeatures.sType            = vk::VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2;
-       deviceFeatures.pNext            = &protectedFeatures;
- 
-       vki.getPhysicalDeviceFeatures2(physicalDevice, &deviceFeatures);
- 
 +      const vk::VkImageUsageFlagBits framebufferUsageFlag = vk::isDepthStencilFormat(format) ? vk::VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT
 +                                                                                                                                                                                 : vk::VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
 +
        const vk::VkImageUsageFlagBits                            usageFlags[]            =
        {
                vk::VK_IMAGE_USAGE_TRANSFER_SRC_BIT,
@@@ -4049,11 -4054,8 +4059,8 @@@
                for (size_t createFlagNdx = 0; createFlagNdx < numOfCreateFlags; createFlagNdx++)
                {
                        const size_t    bit     = numOfUsageFlags + createFlagNdx;
 -                      if ((combo & (1u << bit)) == 0)
 +                      if ((combo & (one << bit)) == 0)
                                continue;
-                       if (((createFlags[createFlagNdx] & vk::VK_IMAGE_CREATE_PROTECTED_BIT) == vk::VK_IMAGE_CREATE_PROTECTED_BIT ) &&
-                               (protectedFeatures.protectedMemory == VK_FALSE))
-                               continue;
                        createFlag |= createFlags[createFlagNdx];
                        requiredAhbUsage |= ahbApi->vkCreateToAhbUsage(createFlags[createFlagNdx]);
                }

diff --cc external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp
Simple merge