Merge vk-gl-cts/vulkan-cts-1.2.2 into vk-gl-cts/vulkan-cts-1.2.3

Change-Id: If6ab8dd1d8164a6977a8af611ac20283f89fb86c

diff --cc external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp
index a652849,26bddd6..3453168
--- 1/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp
--- 2/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp
@@@ -298,11 -295,8 +298,14 @@@ void supportedCheck (Context& context, 
  
                context.getInstanceInterface().getPhysicalDeviceProperties2(context.getPhysicalDevice(), &properties);
  
 +              if (caseDef.requiredSubgroupSize < (int)subgroupSizeControlProperties.minSubgroupSize
 +                      || caseDef.requiredSubgroupSize > (int)subgroupSizeControlProperties.maxSubgroupSize)
 +              {
 +                      TCU_THROW(NotSupportedError, "Unsupported subgroup size");
 +              }
++
+               if ((subgroupSizeControlProperties.requiredSubgroupSizeStages & caseDef.shaderStage) != caseDef.shaderStage)
+                       TCU_THROW(NotSupportedError, "Required subgroup size is not supported for shader stage");
        }
  
        *caseDef.geometryPointSizeSupported = subgroups::isTessellationAndGeometryPointSizeSupported(context);