Module: Mesa Branch: staging/21.0 Commit: b8f8bcb3997546fabdc02d16a276ad0ab202fd3e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b8f8bcb3997546fabdc02d16a276ad0ab202fd3e
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 | 18 +++++++++--------- src/intel/vulkan/anv_formats.c | 5 ++++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index f12c4829a88..be893b0379a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1615,7 +1615,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 }, @@ -1813,7 +1813,7 @@ "description": "iris: Avoid sampling some MCS surfaces with clear", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, @@ -1822,7 +1822,7 @@ "description": "anv: Avoid sampling some MCS surfaces with clear", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, @@ -1831,7 +1831,7 @@ "description": "anv: Add clear_supported to anv_layout_to_aux_state", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, @@ -1876,7 +1876,7 @@ "description": "compiler/nir: check whether var is an input in lower_fragcoord_wtrans", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "418c4c0d7d48a42f475df1ffb93b3a33763e7a4a" }, @@ -1939,7 +1939,7 @@ "description": "intel: Add 2 ADL-S pci-ids", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, @@ -1948,7 +1948,7 @@ "description": "driconf: set vk_x11_strict_image_count for Metro: Exodus", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, @@ -1975,7 +1975,7 @@ "description": "anv: handle spirv parsing failure", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, @@ -1993,7 +1993,7 @@ "description": "intel/isl: Add Wa_22011186057 to disable CCS on ADL GT2 A0", "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 33ca701ae9e..b3eaa2a9e0e 100644 --- a/src/intel/vulkan/anv_formats.c +++ b/src/intel/vulkan/anv_formats.c @@ -646,9 +646,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
