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

Change-Id: Iccd8336664b28aaa5c009f7da85295995a8297eb

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

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

diff --cc external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp
index 627814d,af0661c..246d28f
--- 1/external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp
--- 2/external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp
+++ b/external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp
@@@ -484,8 -484,11 +484,11 @@@ StoreTest::StoreTest (tcu::TestContext
  
  void StoreTest::checkSupport (Context& context) const
  {
 -      const VkFormatProperties3KHR formatProperties (context.getFormatProperties(m_format));
 +      const VkFormatProperties3 formatProperties (context.getFormatProperties(m_format));
  
+       if (!m_declareImageFormatInShader && !(formatProperties.bufferFeatures & VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT_KHR))
+               TCU_THROW(NotSupportedError, "Format not supported for unformatted stores via storage buffer");
+ 
        if (!m_declareImageFormatInShader && !(formatProperties.optimalTilingFeatures & VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT_KHR))
                TCU_THROW(NotSupportedError, "Format not supported for unformatted stores via storage images");
  

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

diff --cc external/vulkancts/modules/vulkan/reconvergence/vktReconvergenceTests.cpp
index c200225,d637c38..2fe77fe
--- 1/external/vulkancts/modules/vulkan/reconvergence/vktReconvergenceTests.cpp
--- 2/external/vulkancts/modules/vulkan/reconvergence/vktReconvergenceTests.cpp
+++ b/external/vulkancts/modules/vulkan/reconvergence/vktReconvergenceTests.cpp
@@@ -1740,8 -1740,9 +1740,9 @@@ tcu::TestStatus ReconvergenceTestInstan
        flushAlloc(vk, device, buffers[1]->getAllocation());
        flushAlloc(vk, device, buffers[2]->getAllocation());
  
-       const VkBool32 computeFullSubgroups = subgroupProperties.subgroupSize <= 64 &&
-                                                                                 m_context.getSubgroupSizeControlFeatures().computeFullSubgroups;
+       const VkBool32 computeFullSubgroups     =       (subgroupProperties.subgroupSize <= 64) &&
 -                                                                                      (m_context.getSubgroupSizeControlFeaturesEXT().computeFullSubgroups) &&
 -                                                                                      (m_context.getSubgroupSizeControlPropertiesEXT().requiredSubgroupSizeStages & VK_SHADER_STAGE_COMPUTE_BIT);
++                                                                                      (m_context.getSubgroupSizeControlFeatures().computeFullSubgroups) &&
++                                                                                      (m_context.getSubgroupSizeControlProperties().requiredSubgroupSizeStages & VK_SHADER_STAGE_COMPUTE_BIT);
  
        const VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT subgroupSizeCreateInfo =
        {

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

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

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

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