commit 95ffe036632c5de2e52a01d243e945a1123c91a2
author Jason Macnak <natsu@google.com> Sat Nov 21 19:49:55 2020 -0800
committer Jason Macnak <natsu@google.com> Wed Dec 02 20:44:05 2020 +0000
tree 75731a527918ec4ef6fdc9a68c900b7350fb543f
parent 6f6ca293c707be352e6e0204810652de9720cc72

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>

src/Vulkan/libVulkan.cpp

diff --git a/src/Vulkan/libVulkan.cpp b/src/Vulkan/libVulkan.cpp
index 26b23c0..7736e19 100644
--- a/src/Vulkan/libVulkan.cpp
+++ b/src/Vulkan/libVulkan.cpp
@@ -387,7 +387,9 @@
 	{ 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 @@
 				ycbcrConversion = vk::Cast(samplerYcbcrConversionInfo->conversion);
 			}
 			break;
+#if !defined(__ANDROID__)
 			case VK_STRUCTURE_TYPE_SAMPLER_FILTERING_PRECISION_GOOGLE:
 			{
 				const VkSamplerFilteringPrecisionGOOGLE *filteringInfo =
@@ -1952,6 +1955,7 @@
 				filteringPrecision = filteringInfo->samplerFilteringPrecisionMode;
 			}
 			break;
+#endif
 			default:
 				LOG_TRAP("pCreateInfo->pNext sType = %s", vk::Stringify(extensionCreateInfo->sType).c_str());
 				break;