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

Change-Id: I05f8e0d8240f265b9e150f37e580850e7a259a08

diff --cc AndroidGen.mk
Simple merge

diff --cc android/cts/master/vk-master.txt
Simple merge

diff --cc external/vulkancts/modules/vulkan/clipping/vktClippingTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp
index 743756f,08f1dc6..8ccd654
--- 1/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp
--- 2/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp
+++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp
@@@ -116,15 -116,10 +116,15 @@@ public
                        || config.semaphoreHandleType == vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR
                        || config.semaphoreHandleType == vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR)
                {
-                       requireDeviceExtension("VK_KHR_external_semaphore_fd");
-                       requireDeviceExtension("VK_KHR_external_memory_fd");
+                       m_context.requireDeviceFunctionality("VK_KHR_external_semaphore_fd");
+                       m_context.requireDeviceFunctionality("VK_KHR_external_memory_fd");
                }
  
-                       requireDeviceExtension("VK_EXT_external_memory_dma_buf");
 +              if (config.memoryHandleType == vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT)
 +              {
++                      m_context.requireDeviceFunctionality("VK_EXT_external_memory_dma_buf");
 +              }
 +
                if (config.memoryHandleType == vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR
                        || config.memoryHandleType == vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR
                        || config.semaphoreHandleType == vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR
@@@ -1326,14 -1351,9 +1359,14 @@@ static void createTests (tcu::TestCaseG
                        vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT,
                        "_win32"
                },
 +              {
 +                      vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT,
 +                      vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT,
 +                      "_dma_buf"
 +              },
        };
  
-       const std::string semaphoreNames[vk::VK_SEMAPHORE_TYPE_KHR_LAST] =
+       const std::string semaphoreNames[vk::VK_SEMAPHORE_TYPE_LAST] =
        {
                "_binary_semaphore",
                "_timeline_semaphore",

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

diff --cc external/vulkancts/mustpass/master/vk-default-no-waivers.txt
Simple merge

diff --cc external/vulkancts/mustpass/master/vk-default.txt
Simple merge