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

Change-Id: I5345587323415ff836b8b6f66a0d6fa8716107dd

diff --cc external/vulkancts/modules/vulkan/api/vktApiDescriptorPoolTests.cpp
index 03d7c57,726bbd9..39cf3dc
--- 1/external/vulkancts/modules/vulkan/api/vktApiDescriptorPoolTests.cpp
--- 2/external/vulkancts/modules/vulkan/api/vktApiDescriptorPoolTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiDescriptorPoolTests.cpp
@@@ -142,12 -130,11 +142,13 @@@ tcu::TestStatus resetDescriptorPoolTes
  
                        vector<VkDescriptorSet> testSets(numDescriptorSetsPerIter);
  
 -                      for (deUint32 ndx = 0; ndx < numIterations; ++ndx)
 +                      for (deUint32 ndx = 0; ndx < params.m_numIterations; ++ndx)
                        {
+                               if (ndx % 1024 == 0) context.getTestContext().touchWatchdog();
                                // The test should crash in this loop at some point if there is a memory leak
                                VK_CHECK(vkd.allocateDescriptorSets(device, &descriptorSetInfo, &testSets[0]));
 +                              if (params.m_freeDescriptorSets)
 +                                      VK_CHECK(vkd.freeDescriptorSets(device, *descriptorPool, 1, &testSets[0]));
                                VK_CHECK(vkd.resetDescriptorPool(device, *descriptorPool, 0));
                        }
  

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