Module: Mesa Branch: main Commit: 5f8e043fb6923b26ad1e333aef78d83163af729d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f8e043fb6923b26ad1e333aef78d83163af729d
Author: Jason Ekstrand <[email protected]> Date: Mon Sep 27 18:52:09 2021 -0500 iris: Handle states=NULL in iris_bind_sampler_states Clover likes to do this to clear our a bunch of samplers without actually passing an array of NULL pointers. It's easy enough to handle in iris. Reviewed-by: Kenneth Graunke <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13072> --- src/gallium/drivers/iris/iris_state.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index 700a5db6c4f..7ba4cfbe955 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -2081,8 +2081,9 @@ iris_bind_sampler_states(struct pipe_context *ctx, bool dirty = false; for (int i = 0; i < count; i++) { - if (shs->samplers[start + i] != states[i]) { - shs->samplers[start + i] = states[i]; + struct iris_sampler_state *state = states ? states[i] : NULL; + if (shs->samplers[start + i] != state) { + shs->samplers[start + i] = state; dirty = true; } }
