From 9d3ce656289356593fd85832b712779051876e19 Mon Sep 17 00:00:00 2001 From: Jianxun Zhang Date: Wed, 8 May 2024 19:41:33 -0700 Subject: [PATCH] blorp: Don't convert ccs_e formats for copy (xe2) Fix: dEQP-GLES3.functional.texture.filtering.3d.formats.rgb9_e5_linear blorp_blit.c:2770: get_ccs_compatible_copy_format: Assertion `!"" "Not a compressible format"' failed. Signed-off-by: Jianxun Zhang Reviewed-by: Nanley Chery Part-of: --- src/intel/blorp/blorp_blit.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/intel/blorp/blorp_blit.c b/src/intel/blorp/blorp_blit.c index b5ecc41353f..930cadecda1 100644 --- a/src/intel/blorp/blorp_blit.c +++ b/src/intel/blorp/blorp_blit.c @@ -2880,7 +2880,8 @@ blorp_copy_get_formats(const struct isl_device *isl_dev, *src_view_format = *dst_view_format = get_copy_format_for_bpb(isl_dev, dst_fmtl->bpb); - } else if (isl_format_supports_ccs_e(isl_dev->info, dst_surf->format)) { + } else if (ISL_GFX_VER(isl_dev) < 20 && + isl_format_supports_ccs_e(isl_dev->info, dst_surf->format)) { *dst_view_format = get_ccs_compatible_copy_format(dst_fmtl); if (isl_format_supports_ccs_e(isl_dev->info, src_surf->format)) { *src_view_format = get_ccs_compatible_copy_format(src_fmtl); @@ -2889,7 +2890,8 @@ blorp_copy_get_formats(const struct isl_device *isl_dev, } else { *src_view_format = get_copy_format_for_bpb(isl_dev, src_fmtl->bpb); } - } else if (isl_format_supports_ccs_e(isl_dev->info, src_surf->format)) { + } else if (ISL_GFX_VER(isl_dev) < 20 && + isl_format_supports_ccs_e(isl_dev->info, src_surf->format)) { *src_view_format = get_ccs_compatible_copy_format(src_fmtl); if (src_fmtl->bpb == dst_fmtl->bpb) { *dst_view_format = *src_view_format;