Check sampling support in vkGetPhysicalDeviceImageFormatProperties

We're supposed to validate the request against what we can actually support, and return VK_ERROR_FORMAT_NOT_SUPPORTED if not supported. We had previously only considered total lack of support for the format. Test: dEQP-VK.texture.shadow.* Change-Id: Ic5aa81f232bf04583060e88334f7f38dd5f2b2e9 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/31068Tested-by: Chris Forbes <chrisforbes@google.com> Presubmit-Ready: Chris Forbes <chrisforbes@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Check sampling support in vkGetPhysicalDeviceImageFormatProperties
1bc7731e · Chris Forbes · 60f15eca · 1bc7731e
Commit 1bc7731e authored May 09, 2019 by Chris Forbes
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 2 deletions

libVulkan.cpp src/Vulkan/libVulkan.cpp +15 -2

No files found.
--- a/src/Vulkan/libVulkan.cpp
+++ b/src/Vulkan/libVulkan.cpp
@@ -240,18 +240,31 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceImageFormatProperties(VkPhysic
 	VkFormatProperties properties;
 	vk::Cast(physicalDevice)->getFormatProperties(format, &properties);

+	VkFormatFeatureFlags features;
 	switch (tiling)
 	{
 	case VK_IMAGE_TILING_LINEAR:
-		if (properties.linearTilingFeatures == 0) return VK_ERROR_FORMAT_NOT_SUPPORTED;
+		features = properties.linearTilingFeatures;
 		break;

 	case VK_IMAGE_TILING_OPTIMAL:
-		if (properties.optimalTilingFeatures == 0) return VK_ERROR_FORMAT_NOT_SUPPORTED;
+		features = properties.optimalTilingFeatures;
 		break;

 	default:
 		UNIMPLEMENTED("tiling");
+		features = 0;
+	}
+
+	if (features == 0)
+	{
+		return VK_ERROR_FORMAT_NOT_SUPPORTED;
+	}
+
+	// Check for usage conflict with features
+	if ((usage & VK_IMAGE_USAGE_SAMPLED_BIT) && !(features & VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT))
+	{
+		return VK_ERROR_FORMAT_NOT_SUPPORTED;
 	}

 	vk::Cast(physicalDevice)->getImageFormatProperties(format, type, tiling, usage, flags, pImageFormatProperties);