Vulkan: Match min/magFilter to chromaFilter

VkSamplerCreateInfo.magFilter and minFilter must match VkSamplerYcbcrConversionCreateInfo.chromaFilter. VkSamplerYcbcrConversionCreateInfo.chromaFilter is currently hard-coded to VK_FILTER_NEAREST in HardwareBufferImageSiblingVkAndroid(), so force magFilter and minFilter to VK_FILTER_NEAREST in SamplerDesc::init() if an externalFormat is being used. Bug: b/178424566 Change-Id: Ia1f7fc21e3faa4e57f837ed3ae70608134150aea Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2683038 Commit-Queue: Tim Van Patten <timvp@google.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Vulkan: Match min/magFilter to chromaFilter
80308e20 · Tim Van Patten · Commit Bot · bb062070 · 80308e20
Commit 80308e20 authored Feb 08, 2021 by Tim Van Patten Committed by Commit Bot Feb 10, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

vk_cache_utils.cpp src/libANGLE/renderer/vulkan/vk_cache_utils.cpp +10 -0

No files found.
--- a/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp
@@ -3162,6 +3162,16 @@ angle::Result SamplerDesc::init(ContextVk *contextVk, Sampler *sampler) const
        createInfo.addressModeW            = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
        createInfo.anisotropyEnable        = VK_FALSE;
        createInfo.unnormalizedCoordinates = VK_FALSE;
+        // VUID-VkSamplerCreateInfo-minFilter VkCreateSampler:
+        // VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT
+        // specifies that the format can have different chroma, min, and mag filters. However,
+        // VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT is
+        // not supported for VkSamplerYcbcrConversionCreateInfo.format = VK_FORMAT_UNDEFINED so
+        // minFilter/magFilter needs to be equal to chromaFilter.
+        // HardwareBufferImageSiblingVkAndroid() forces VK_FILTER_NEAREST, so force
+        // VK_FILTER_NEAREST here too.
+        createInfo.magFilter = VK_FILTER_NEAREST;
+        createInfo.minFilter = VK_FILTER_NEAREST;
    }
    ANGLE_VK_TRY(contextVk, sampler->init(contextVk->getDevice(), createInfo));