Mesa (main): panvk: Fix sampler filter modes on Bifrost

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: b17f90ab4abecb54accf29ab864023e69574ff66
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b17f90ab4abecb54accf29ab864023e69574ff66

Author: Alyssa Rosenzweig <alyssa at collabora.com>
Date:   Fri Jul 23 10:31:15 2021 -0400

panvk: Fix sampler filter modes on Bifrost

The logic was incorrectly inverted, although it is correct for Midgard
and in OpenGL.

Signed-off-by: Alyssa Rosenzweig <alyssa at collabora.com>
Suggested-by: Boris Brezillon <boris.brezillon at collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11851>

---

 src/panfrost/vulkan/panvk_device.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/panfrost/vulkan/panvk_device.c b/src/panfrost/vulkan/panvk_device.c
index 4b68b9ef0e6..62367ac2692 100644
--- a/src/panfrost/vulkan/panvk_device.c
+++ b/src/panfrost/vulkan/panvk_device.c
@@ -1999,8 +1999,8 @@ panvk_init_bifrost_sampler(struct panvk_sampler *sampler,
       vk_find_struct_const(pCreateInfo->pNext, SAMPLER_CUSTOM_BORDER_COLOR_CREATE_INFO_EXT);
 
    pan_pack(&sampler->desc, BIFROST_SAMPLER, cfg) {
-      cfg.magnify_nearest = pCreateInfo->magFilter == VK_FILTER_LINEAR;
-      cfg.minify_nearest = pCreateInfo->minFilter == VK_FILTER_LINEAR;
+      cfg.magnify_nearest = pCreateInfo->magFilter == VK_FILTER_NEAREST;
+      cfg.minify_nearest = pCreateInfo->minFilter == VK_FILTER_NEAREST;
       cfg.mipmap_mode = panvk_translate_sampler_mipmap_mode(pCreateInfo->mipmapMode);
       cfg.normalized_coordinates = !pCreateInfo->unnormalizedCoordinates;