Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Ifce84bc2e772e60ba1b3905bf3d5251cd2462833

diff --cc AndroidGen.mk
Simple merge

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

diff --cc external/vulkancts/modules/vulkan/api/CMakeLists.txt
Simple merge

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

diff --cc external/vulkancts/modules/vulkan/api/vktApiTests.cpp
index 3d854f2,b3eae84..c307ead
--- 1/external/vulkancts/modules/vulkan/api/vktApiTests.cpp
--- 2/external/vulkancts/modules/vulkan/api/vktApiTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiTests.cpp
@@@ -66,26 -66,26 +67,27 @@@ void createApiTests (tcu::TestCaseGroup
  {
        tcu::TestContext&       testCtx         = apiTests->getTestContext();
  
-       apiTests->addChild(createVersionSanityCheckTests        (testCtx));
-       apiTests->addChild(createDriverPropertiesTests          (testCtx));
-       apiTests->addChild(createSmokeTests                                     (testCtx));
-       apiTests->addChild(api::createFeatureInfoTests          (testCtx));
-       apiTests->addChild(createDeviceInitializationTests      (testCtx));
-       apiTests->addChild(createObjectManagementTests          (testCtx));
-       apiTests->addChild(createBufferTests                            (testCtx));
-       apiTests->addChild(createTestGroup                                      (testCtx, "buffer_view",        "BufferView tests",             createBufferViewTests));
-       apiTests->addChild(createCommandBuffersTests            (testCtx));
-       apiTests->addChild(createCopiesAndBlittingTests         (testCtx));
-       apiTests->addChild(createImageClearingTests                     (testCtx));
-       apiTests->addChild(createFillAndUpdateBufferTests       (testCtx));
-       apiTests->addChild(createDescriptorPoolTests            (testCtx));
-       apiTests->addChild(createNullHandleTests                        (testCtx));
-       apiTests->addChild(createGranularityQueryTests          (testCtx));
-       apiTests->addChild(createMemoryCommitmentTests          (testCtx));
-       apiTests->addChild(createExternalMemoryTests            (testCtx));
-       apiTests->addChild(createMaintenance3Tests                      (testCtx));
-       apiTests->addChild(createDescriptorSetTests                     (testCtx));
-       apiTests->addChild(createPipelineTests                          (testCtx));
+       apiTests->addChild(createVersionSanityCheckTests                        (testCtx));
++      apiTests->addChild(createDriverPropertiesTests                          (testCtx));
+       apiTests->addChild(createSmokeTests                                                     (testCtx));
+       apiTests->addChild(api::createFeatureInfoTests                          (testCtx));
+       apiTests->addChild(createDeviceInitializationTests                      (testCtx));
+       apiTests->addChild(createObjectManagementTests                          (testCtx));
+       apiTests->addChild(createBufferTests                                            (testCtx));
+       apiTests->addChild(createTestGroup                                                      (testCtx, "buffer_view",        "BufferView tests",             createBufferViewTests));
+       apiTests->addChild(createCommandBuffersTests                            (testCtx));
+       apiTests->addChild(createCopiesAndBlittingTests                         (testCtx));
+       apiTests->addChild(createImageClearingTests                                     (testCtx));
+       apiTests->addChild(createFillAndUpdateBufferTests                       (testCtx));
+       apiTests->addChild(createDescriptorPoolTests                            (testCtx));
+       apiTests->addChild(createNullHandleTests                                        (testCtx));
+       apiTests->addChild(createGranularityQueryTests                          (testCtx));
+       apiTests->addChild(createMemoryCommitmentTests                          (testCtx));
+       apiTests->addChild(createExternalMemoryTests                            (testCtx));
+       apiTests->addChild(createMaintenance3Tests                                      (testCtx));
+       apiTests->addChild(createDescriptorSetTests                                     (testCtx));
+       apiTests->addChild(createPipelineTests                                          (testCtx));
+       apiTests->addChild(createMemoryRequirementInvarianceTests       (testCtx));
  }
  
  } // anonymous

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

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