From: Kenneth Graunke Date: Wed, 1 May 2019 18:16:13 +0000 (-0700) Subject: iris: Fix imageBuffer and PBO download. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ebbb05b3c93d8f62985099cc9d4cf157c597f4b5;p=mesa.git iris: Fix imageBuffer and PBO download. Recently we added checks to try and deny multisampled shader images. Unfortunately, this messed up imageBuffers, which have sample_count = 0, which are also used in PBO download, causing us hit CPU map fallbacks. Fixes: b15f5cfd20c iris: Do not advertise multisampled image load/store. Reviewed-by: Rafael Antognolli --- diff --git a/src/gallium/drivers/iris/iris_formats.c b/src/gallium/drivers/iris/iris_formats.c index 1c32f1a6aa1..87bbcbd4069 100644 --- a/src/gallium/drivers/iris/iris_formats.c +++ b/src/gallium/drivers/iris/iris_formats.c @@ -455,9 +455,9 @@ iris_is_format_supported(struct pipe_screen *pscreen, if (usage & PIPE_BIND_SHADER_IMAGE) { /* Dataport doesn't support compression, and we can't resolve an MCS - * compressed surface. + * compressed surface. (Buffer images may have sample count of 0.) */ - supported &= sample_count == 1; + supported &= sample_count <= 1; // XXX: allow untyped reads supported &= isl_format_supports_typed_reads(devinfo, format) &&