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 <rafael.antognolli@intel.com>

diff --git a/src/gallium/drivers/iris/iris_formats.c b/src/gallium/drivers/iris/iris_formats.c
index 1c32f1a..87bbcbd 100644 (file)
--- 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) &&