From 70e8f8b4d0447aff71e7c59710f9ed184a8f613b Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 14 Feb 2023 10:10:20 -0500 Subject: [PATCH] zink: block LINEAR filtered blits for zs formats this is illegal, and the u_blitter path has to be taken to guarantee enough accuracy that the strictest piglit tests pass cc: mesa-stable Part-of: (cherry picked from commit f0e1512673d07530f4631c9664c868698c512ac4) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_blit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 74968058978..16e7cdf7962 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3262,7 +3262,7 @@ "description": "zink: block LINEAR filtered blits for zs formats", "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 92e6ef664ef..df718afc7fe 100644 --- a/src/gallium/drivers/zink/zink_blit.c +++ b/src/gallium/drivers/zink/zink_blit.c @@ -128,7 +128,7 @@ blit_native(struct zink_context *ctx, const struct pipe_blit_info *info, bool *n return false; if (util_format_is_depth_or_stencil(info->dst.format) && - info->dst.format != info->src.format) + (info->dst.format != info->src.format || info->filter == PIPE_TEX_FILTER_LINEAR)) return false; /* vkCmdBlitImage must not be used for multisampled source or destination images. */