Guard VK_GOOGLE_SAMPLER_FILTERING_PRECISION

... to disable the extension on Cuttlefish in order to pass dEQP-VK.api.info.android#no_unknown_extensions on Cuttlefish. Bug: b/174028661 Test: cts -m CtsDeqpTestCases Change-Id: I9af0194e724a738491f6820eb2ca8947ac202e5a Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/50688 Presubmit-Ready: Jason Macnak <natsu@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Jason Macnak <natsu@google.com>

Guard VK_GOOGLE_SAMPLER_FILTERING_PRECISION
95ffe036 · Jason Macnak · 6f6ca293 · 95ffe036
Commit 95ffe036 authored Nov 21, 2020 by Jason Macnak
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

libVulkan.cpp src/Vulkan/libVulkan.cpp +4 -0

No files found.
--- a/src/Vulkan/libVulkan.cpp
+++ b/src/Vulkan/libVulkan.cpp
@@ -387,7 +387,9 @@ static const VkExtensionProperties deviceExtensionProperties[] = {
 	{ VK_FUCHSIA_EXTERNAL_MEMORY_EXTENSION_NAME, VK_FUCHSIA_EXTERNAL_MEMORY_SPEC_VERSION },
 #endif
 	{ VK_EXT_PROVOKING_VERTEX_EXTENSION_NAME, VK_EXT_PROVOKING_VERTEX_SPEC_VERSION },
+#if !defined(__ANDROID__)
 	{ VK_GOOGLE_SAMPLER_FILTERING_PRECISION_EXTENSION_NAME, VK_GOOGLE_SAMPLER_FILTERING_PRECISION_SPEC_VERSION },
+#endif
 	{ VK_EXT_DEPTH_RANGE_UNRESTRICTED_EXTENSION_NAME, VK_EXT_DEPTH_RANGE_UNRESTRICTED_SPEC_VERSION },
 #ifdef SWIFTSHADER_DEVICE_MEMORY_REPORT
 	{ VK_EXT_DEVICE_MEMORY_REPORT_EXTENSION_NAME, VK_EXT_DEVICE_MEMORY_REPORT_SPEC_VERSION },
@@ -1945,6 +1947,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateSampler(VkDevice device, const VkSamplerC
 				ycbcrConversion = vk::Cast(samplerYcbcrConversionInfo->conversion);
 			}
 			break;
+#if !defined(__ANDROID__)
 			case VK_STRUCTURE_TYPE_SAMPLER_FILTERING_PRECISION_GOOGLE:
 			{
 				const VkSamplerFilteringPrecisionGOOGLE *filteringInfo =
@@ -1952,6 +1955,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateSampler(VkDevice device, const VkSamplerC
 				filteringPrecision = filteringInfo->samplerFilteringPrecisionMode;
 			}
 			break;
+#endif
 			default:
 				LOG_TRAP("pCreateInfo->pNext sType = %s", vk::Stringify(extensionCreateInfo->sType).c_str());
 				break;