From 27af1352803bed4f78744d36638dff28d04decbb Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Thu, 10 Dec 2020 19:48:17 +0100 Subject: [PATCH] panfrost: Allow 2DMS arrays The midgard compiler has been fixed to handle texture operations on 2DMS arrays, and Bifrost already had this case handled properly. Relax the assert. Signed-off-by: Boris Brezillon Reviewed-by: Alyssa Rosenzweig Part-of: --- src/gallium/drivers/panfrost/pan_context.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c index 2b752c07580..1e033a7ab6d 100644 --- a/src/gallium/drivers/panfrost/pan_context.c +++ b/src/gallium/drivers/panfrost/pan_context.c @@ -1017,10 +1017,11 @@ panfrost_create_sampler_view_bo(struct panfrost_sampler_view *so, array_size /= 6; } - /* MSAA only supported for 2D textures (and 2D texture arrays via an - * extension currently unimplemented) */ + /* MSAA only supported for 2D textures */ - assert(texture->nr_samples <= 1 || so->base.target == PIPE_TEXTURE_2D); + assert(texture->nr_samples <= 1 || + so->base.target == PIPE_TEXTURE_2D || + so->base.target == PIPE_TEXTURE_2D_ARRAY); enum mali_texture_dimension type = panfrost_translate_texture_dimension(so->base.target);