From: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon, 3 Dec 2018 07:03:08 +0000 (-0800)
Subject: iris: fix overhead regression from flushing for storage images
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=598ce8e88ea7f854d98559be88a19aa0e8264123;p=mesa.git

iris: fix overhead regression from flushing for storage images

st calls us with count = 32 but a NULL pointer...we only really care
about the highest non-NULL image...
---

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 88a109ad3ca..a595e37751a 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -1678,7 +1678,8 @@ iris_set_shader_images(struct pipe_context *ctx,
    gl_shader_stage stage = stage_from_pipe(p_stage);
    struct iris_shader_state *shs = &ice->state.shaders[stage];
 
-   shs->num_images = MAX2(shs->num_images, start_slot + count);
+   if (p_images)
+      shs->num_images = MAX2(shs->num_images, start_slot + count);
 
    for (unsigned i = 0; i < count; i++) {
       if (p_images && p_images[i].resource) {