From 37a0185ec22c05ddfc1ca52150ccaf0cc91c6489 Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Wed, 29 Dec 2021 11:18:27 -0500 Subject: [PATCH] iris: Drop stale media compression import code With commit f57c074270e, ("gallium/dri: Allow use of R8G8_R8B8 for YUYV and G8R8_B8R8 for UYVY"), iris stopped lowering media compressed surfaces to multiple planes. Reviewed-by: Jordan Justen Part-of: --- src/gallium/drivers/iris/iris_resource.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c index 348665d6332..c4b480be566 100644 --- a/src/gallium/drivers/iris/iris_resource.c +++ b/src/gallium/drivers/iris/iris_resource.c @@ -1003,18 +1003,12 @@ iris_resource_finish_aux_import(struct pipe_screen *pscreen, if (num_main_planes == 1 && num_planes == 2) { import_aux_info(r[0], r[1]); map_aux_addresses(screen, r[0], format, 0); - } else if (num_main_planes == 2 && num_planes == 4) { + } else { + assert(num_main_planes == 2 && num_planes == 4); import_aux_info(r[0], r[2]); import_aux_info(r[1], r[3]); map_aux_addresses(screen, r[0], format, 0); map_aux_addresses(screen, r[1], format, 1); - } else { - /* Gallium has lowered a single main plane into two. */ - assert(num_main_planes == 2 && num_planes == 3); - assert(isl_format_is_yuv(format) && !isl_format_is_planar(format)); - import_aux_info(r[0], r[2]); - import_aux_info(r[1], r[2]); - map_aux_addresses(screen, r[0], format, 0); } assert(!isl_aux_usage_has_fast_clears(res->mod_info->aux_usage)); break;