From 82b46667836647226387442b2feb9d7f1475bd36 Mon Sep 17 00:00:00 2001 From: Danylo Piliaiev Date: Fri, 24 Apr 2020 15:11:44 +0300 Subject: [PATCH] iris: Honor scanout requirement from DRI Translate PIPE_BIND_SCANOUT as ISL_SURF_USAGE_DISPLAY_BIT, instead of PIPE_BIND_DISPLAY_TARGET. PIPE_BIND_DISPLAY_TARGET isn't used for dri images and seem to be set only for fake winsys buffers (which aren't displayed). The trouble is that a fake buffer could be multisampled and we cannot have multisampled surface with display bit. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2313 Signed-off-by: Danylo Piliaiev Reviewed-by: Lionel Landwerlin Reviewed-by: Eric Anholt Part-of: --- src/gallium/drivers/iris/iris_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c index ff5023f7d38..e0811827692 100644 --- a/src/gallium/drivers/iris/iris_resource.c +++ b/src/gallium/drivers/iris/iris_resource.c @@ -227,7 +227,7 @@ pipe_bind_to_isl_usage(unsigned bindings) if (bindings & (PIPE_BIND_SHADER_IMAGE | PIPE_BIND_SHADER_BUFFER)) usage |= ISL_SURF_USAGE_STORAGE_BIT; - if (bindings & PIPE_BIND_DISPLAY_TARGET) + if (bindings & PIPE_BIND_SCANOUT) usage |= ISL_SURF_USAGE_DISPLAY_BIT; return usage; -- 2.30.2