Merge vk-gl-cts/vulkan-cts-1.2.8 into vk-gl-cts/vulkan-cts-1.3.0

Change-Id: Ie7b28e84ceb9de28964db02e7744a01ea52b7c50

diff --cc external/vulkancts/modules/vulkan/api/vktApiToolingInfoTests.cpp
index c2b4dca,b525038..69f5ac0
--- 1/external/vulkancts/modules/vulkan/api/vktApiToolingInfoTests.cpp
--- 2/external/vulkancts/modules/vulkan/api/vktApiToolingInfoTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiToolingInfoTests.cpp
@@@ -127,7 -127,12 +127,12 @@@ tcu::TestStatus validateGetter (Context
  
                std::vector<VkPhysicalDeviceToolPropertiesEXT>  deviceToolPropertiesEXTArray(toolCountSecondCall);
  
 -              result = context.getInstanceInterface().getPhysicalDeviceToolPropertiesEXT(context.getPhysicalDevice(), &toolCountSecondCall, &deviceToolPropertiesEXTArray[0]);
+               for (size_t toolNdx = 0; toolNdx < deviceToolPropertiesEXTArray.size(); ++toolNdx)
+               {
+                       deviceToolPropertiesEXTArray[toolNdx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT;
+               }
+ 
 +              result = context.getInstanceInterface().getPhysicalDeviceToolProperties(context.getPhysicalDevice(), &toolCountSecondCall, &deviceToolPropertiesEXTArray[0]);
  
                if (result != VK_SUCCESS)
                {
@@@ -182,7 -187,12 +187,12 @@@
  
                std::vector<VkPhysicalDeviceToolPropertiesEXT>  deviceToolPropertiesEXTArray(toolCountSecondCall);
  
 -              result = context.getInstanceInterface().getPhysicalDeviceToolPropertiesEXT(context.getPhysicalDevice(), &toolCountSecondCall, &deviceToolPropertiesEXTArray[0]);
+               for (size_t toolNdx = 0; toolNdx < deviceToolPropertiesEXTArray.size(); ++toolNdx)
+               {
+                       deviceToolPropertiesEXTArray[toolNdx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT;
+               }
+ 
 +              result = context.getInstanceInterface().getPhysicalDeviceToolProperties(context.getPhysicalDevice(), &toolCountSecondCall, &deviceToolPropertiesEXTArray[0]);
  
                if (result != VK_INCOMPLETE)
                {
@@@ -210,7 -220,12 +220,12 @@@ tcu::TestStatus validateToolsPropertie
        {
                std::vector<VkPhysicalDeviceToolPropertiesEXT>  deviceToolPropertiesEXTArray(toolCount);
  
 -              VK_CHECK(context.getInstanceInterface().getPhysicalDeviceToolPropertiesEXT(context.getPhysicalDevice(), &toolCount, &deviceToolPropertiesEXTArray[0]));
+               for (size_t toolNdx = 0; toolNdx < deviceToolPropertiesEXTArray.size(); ++toolNdx)
+               {
+                       deviceToolPropertiesEXTArray[toolNdx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT;
+               }
+ 
 +              VK_CHECK(context.getInstanceInterface().getPhysicalDeviceToolProperties(context.getPhysicalDevice(), &toolCount, &deviceToolPropertiesEXTArray[0]));
  
                if (checkToolsProperties(context, deviceToolPropertiesEXTArray) == false)
                        return tcu::TestStatus::fail("Fail");
@@@ -238,7 -253,12 +253,12 @@@ tcu::TestStatus validateInstanceLayers 
                {
                        std::vector<VkPhysicalDeviceToolPropertiesEXT>  deviceToolPropertiesEXTArray(toolCount);
  
 -                      VK_CHECK(context.getInstanceInterface().getPhysicalDeviceToolPropertiesEXT(physicalDevice, &toolCount, &deviceToolPropertiesEXTArray[0]));
+                       for (size_t toolNdx = 0; toolNdx < deviceToolPropertiesEXTArray.size(); ++toolNdx)
+                       {
+                               deviceToolPropertiesEXTArray[toolNdx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT;
+                       }
+ 
 +                      VK_CHECK(context.getInstanceInterface().getPhysicalDeviceToolProperties(physicalDevice, &toolCount, &deviceToolPropertiesEXTArray[0]));
  
                        if (checkToolsProperties(context, deviceToolPropertiesEXTArray) == false)
                                return tcu::TestStatus::fail("Fail");
@@@ -273,7 -293,12 +293,12 @@@
                {
                        std::vector<VkPhysicalDeviceToolPropertiesEXT>  deviceToolPropertiesEXTArray(toolCount);
  
 -                      VK_CHECK(context.getInstanceInterface().getPhysicalDeviceToolPropertiesEXT(physicalDevice, &toolCount, &deviceToolPropertiesEXTArray[0]));
+                       for (size_t toolNdx = 0; toolNdx < deviceToolPropertiesEXTArray.size(); ++toolNdx)
+                       {
+                               deviceToolPropertiesEXTArray[toolNdx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT;
+                       }
+ 
 +                      VK_CHECK(context.getInstanceInterface().getPhysicalDeviceToolProperties(physicalDevice, &toolCount, &deviceToolPropertiesEXTArray[0]));
  
                        if (checkToolsProperties(context, deviceToolPropertiesEXTArray) == false)
                                return tcu::TestStatus::fail("Fail");

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

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