From: Alexander Galazin <alexander.galazin@arm.com>
Date: Wed, 5 Aug 2020 08:10:42 +0000 (+0200)
Subject: Merge vk-gl-cts/vulkan-cts-1.2.2 into vk-gl-cts/vulkan-cts-1.2.3
X-Git-Tag: upstream/1.3.5~1255^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3fdd0230cd9227248f04661a859b21d3e7337a42;p=platform%2Fupstream%2FVK-GL-CTS.git

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

Change-Id: If6ab8dd1d8164a6977a8af611ac20283f89fb86c
---

3fdd0230cd9227248f04661a859b21d3e7337a42
diff --cc external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp
index a652849,26bddd6..3453168
--- a/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);