From: Tapani Pälli <tapani.palli@intel.com>
Date: Wed, 19 Feb 2020 06:34:51 +0000 (+0200)
Subject: iris: use the images_used mask in resolve pass
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6dd654ba419d792806366f43ba9325f52eab9488;p=mesa.git

iris: use the images_used mask in resolve pass

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4080>
---

diff --git a/src/gallium/drivers/iris/iris_resolve.c b/src/gallium/drivers/iris/iris_resolve.c
index 2208226e607..a46d7bf45b3 100644
--- a/src/gallium/drivers/iris/iris_resolve.c
+++ b/src/gallium/drivers/iris/iris_resolve.c
@@ -116,11 +116,11 @@ static void
 resolve_image_views(struct iris_context *ice,
                     struct iris_batch *batch,
                     struct iris_shader_state *shs,
+                    const struct shader_info *info,
                     bool *draw_aux_buffer_disabled,
                     bool consider_framebuffer)
 {
-   /* TODO: Consider images used by program */
-   uint32_t views = shs->bound_image_views;
+   uint32_t views = info ? (shs->bound_image_views & info->images_used) : 0;
 
    while (views) {
       const int i = u_bit_scan(&views);
@@ -171,7 +171,7 @@ iris_predraw_resolve_inputs(struct iris_context *ice,
    if (ice->state.dirty & dirty) {
       resolve_sampler_views(ice, batch, shs, info, draw_aux_buffer_disabled,
                             consider_framebuffer);
-      resolve_image_views(ice, batch, shs, draw_aux_buffer_disabled,
+      resolve_image_views(ice, batch, shs, info, draw_aux_buffer_disabled,
                           consider_framebuffer);
    }
 }