Mesa (master): iris: fix set_sampler_view

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: b2d651b86267f7511e3c4c35d92c0ff72e174bc7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b2d651b86267f7511e3c4c35d92c0ff72e174bc7

Author: Rob Clark <robdclark at gmail.com>
Date:   Thu Mar 14 15:12:28 2019 -0400

iris: fix set_sampler_view

Update to match docs.

Signed-off-by: Rob Clark <robdclark at gmail.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 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 8f93b733643..25c2af9845e 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -2032,9 +2032,10 @@ iris_set_sampler_views(struct pipe_context *ctx,
    shs->bound_sampler_views &= ~u_bit_consecutive(start, count);
 
    for (unsigned i = 0; i < count; i++) {
+      struct pipe_sampler_view *pview = views ? views[i] : NULL;
       pipe_sampler_view_reference((struct pipe_sampler_view **)
-                                  &shs->textures[start + i], views[i]);
-      struct iris_sampler_view *view = (void *) views[i];
+                                  &shs->textures[start + i], pview);
+      struct iris_sampler_view *view = (void *) pview;
       if (view) {
          view->res->bind_history |= PIPE_BIND_SAMPLER_VIEW;
          shs->bound_sampler_views |= 1 << (start + i);