Module: Mesa Branch: staging/21.1 Commit: 59653e1721f14e4c2757c9148ad5c634452e62de URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=59653e1721f14e4c2757c9148ad5c634452e62de
Author: Tapani Pälli <[email protected]> Date: Fri May 14 09:41:10 2021 +0300 anv: require rendering support for blit destination feature This fixes some new cts tests that exercise blitting between compressed and uncompressed formats. Cc: mesa-stable Signed-off-by: Tapani Pälli <[email protected]> Reviewed-by: Lionel Landwerlin <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10830> (cherry picked from commit 72fd126070ba749e10f7f58b1dfbb52198fb7eb9) --- .pick_status.json | 2 +- src/intel/vulkan/anv_formats.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 07f7364b47d..c3c4694a848 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -229,7 +229,7 @@ "description": "anv: require rendering support for blit destination feature", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c index 6cc79b97845..379ada7811c 100644 --- a/src/intel/vulkan/anv_formats.c +++ b/src/intel/vulkan/anv_formats.c @@ -645,9 +645,12 @@ anv_get_image_format_features(const struct gen_device_info *devinfo, if (flags) { flags |= VK_FORMAT_FEATURE_BLIT_SRC_BIT | - VK_FORMAT_FEATURE_BLIT_DST_BIT | VK_FORMAT_FEATURE_TRANSFER_SRC_BIT | VK_FORMAT_FEATURE_TRANSFER_DST_BIT; + + /* Blit destination requires rendering support. */ + if (isl_format_supports_rendering(devinfo, plane_format.isl_format)) + flags |= VK_FORMAT_FEATURE_BLIT_DST_BIT; } /* XXX: We handle 3-channel formats by switching them out for RGBX or _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
