From 598ce8e88ea7f854d98559be88a19aa0e8264123 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sun, 2 Dec 2018 23:03:08 -0800 Subject: [PATCH] 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... --- src/gallium/drivers/iris/iris_state.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) { -- 2.30.2