commit e001676282cfb0c051a96eca21ab88a2fe26a46c
author Pyry Haulos <phaulos@google.com> Wed Oct 12 11:02:42 2016 -0400
committer Gerrit Code Review <gerrit@gerrit.khronos.org> Wed Oct 12 11:02:42 2016 -0400
tree e5b2977126fbbd24f4df064ca85507cfc2d3c178
parent 377ad0ad5962351d14badb1857b55dc8e8e49218
parent 02c61e30f50cb04505f421b1ebe07c4a42864acf

Merge "Fix required sample counts per spec issue 478" into vulkan-cts-1.0.1

external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp

diff --git a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
index 3b6d4a1..8c05d89 100644
--- a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
@@ -1780,26 +1780,55 @@
 {
 	if (!isCompressedFormat(format))
 	{
-		const tcu::TextureFormat		tcuFormat	= mapVkFormat(format);
+		const tcu::TextureFormat		tcuFormat		= mapVkFormat(format);
+		const bool						hasDepthComp	= (tcuFormat.order == tcu::TextureFormat::D || tcuFormat.order == tcu::TextureFormat::DS);
+		const bool						hasStencilComp	= (tcuFormat.order == tcu::TextureFormat::S || tcuFormat.order == tcu::TextureFormat::DS);
+		const bool						isColorFormat	= !hasDepthComp && !hasStencilComp;
+		VkSampleCountFlags				sampleCounts	= ~(VkSampleCountFlags)0;
 
-		if (usageFlags & VK_IMAGE_USAGE_STORAGE_BIT)
-			return deviceLimits.storageImageSampleCounts;
-		else if (tcuFormat.order == tcu::TextureFormat::D)
-			return deviceLimits.sampledImageDepthSampleCounts;
-		else if (tcuFormat.order == tcu::TextureFormat::S)
-			return deviceLimits.sampledImageStencilSampleCounts;
-		else if (tcuFormat.order == tcu::TextureFormat::DS)
-			return deviceLimits.sampledImageDepthSampleCounts & deviceLimits.sampledImageStencilSampleCounts;
-		else
+		DE_ASSERT((hasDepthComp || hasStencilComp) != isColorFormat);
+
+		if ((usageFlags & VK_IMAGE_USAGE_STORAGE_BIT) != 0)
+			sampleCounts &= deviceLimits.storageImageSampleCounts;
+
+		if ((usageFlags & VK_IMAGE_USAGE_SAMPLED_BIT) != 0)
 		{
-			const tcu::TextureChannelClass	chnClass	= tcu::getTextureChannelClass(tcuFormat.type);
+			if (hasDepthComp)
+				sampleCounts &= deviceLimits.sampledImageDepthSampleCounts;
 
-			if (chnClass == tcu::TEXTURECHANNELCLASS_UNSIGNED_INTEGER ||
-				chnClass == tcu::TEXTURECHANNELCLASS_SIGNED_INTEGER)
-				return deviceLimits.sampledImageIntegerSampleCounts;
-			else
-				return deviceLimits.sampledImageColorSampleCounts;
+			if (hasStencilComp)
+				sampleCounts &= deviceLimits.sampledImageStencilSampleCounts;
+
+			if (isColorFormat)
+			{
+				const tcu::TextureChannelClass	chnClass	= tcu::getTextureChannelClass(tcuFormat.type);
+
+				if (chnClass == tcu::TEXTURECHANNELCLASS_UNSIGNED_INTEGER ||
+					chnClass == tcu::TEXTURECHANNELCLASS_SIGNED_INTEGER)
+					sampleCounts &= deviceLimits.sampledImageIntegerSampleCounts;
+				else
+					sampleCounts &= deviceLimits.sampledImageColorSampleCounts;
+			}
 		}
+
+		if ((usageFlags & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT) != 0)
+			sampleCounts &= deviceLimits.framebufferColorSampleCounts;
+
+		if ((usageFlags & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) != 0)
+		{
+			if (hasDepthComp)
+				sampleCounts &= deviceLimits.framebufferDepthSampleCounts;
+
+			if (hasStencilComp)
+				sampleCounts &= deviceLimits.framebufferStencilSampleCounts;
+		}
+
+		// If there is no usage flag set that would have corresponding device limit,
+		// only VK_SAMPLE_COUNT_1_BIT is required.
+		if (sampleCounts == ~(VkSampleCountFlags)0)
+			sampleCounts &= VK_SAMPLE_COUNT_1_BIT;
+
+		return sampleCounts;
 	}
 	else
 		return VK_SAMPLE_COUNT_1_BIT;