From 1eb541289fdff4e9bac6dea621852dd6f7fbac1c Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 8 Feb 2023 15:36:51 -0500 Subject: [PATCH] zink: always use NEAREST for zs blits LINEAR is illegal, and swapping filtering at this point still seems to be conformant given questionable GL spec requirements for LINEAR zs filtering cc: mesa-stable Part-of: (cherry picked from commit 067545eb9af79414054e4bef3ab48af003758663) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_blit.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 85d3d1368d5..ae158223f55 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -247,7 +247,7 @@ "description": "zink: always use NEAREST for zs blits", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_blit.c b/src/gallium/drivers/zink/zink_blit.c index 59f7fc73c97..92e6ef664ef 100644 --- a/src/gallium/drivers/zink/zink_blit.c +++ b/src/gallium/drivers/zink/zink_blit.c @@ -252,7 +252,8 @@ blit_native(struct zink_context *ctx, const struct pipe_blit_info *info, bool *n VKCTX(CmdBlitImage)(cmdbuf, src->obj->image, src->layout, dst->obj->image, dst->layout, 1, ®ion, - zink_filter(info->filter)); + /* VUID-vkCmdBlitImage-srcImage-00232: zs formats must use NEAREST filtering */ + util_format_is_depth_or_stencil(info->src.format) ? VK_FILTER_NEAREST : zink_filter(info->filter)); return true; }