Mesa (main): llvmpipe: Handle NULL views in llvmpipe_cleanup_stage_sampling

[GitLab Mirror]

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

Author: Joshua Ashton <joshua at froggi.es>
Date:   Tue Jul 13 22:09:24 2021 +0100

llvmpipe: Handle NULL views in llvmpipe_cleanup_stage_sampling

This is the only barrier to lavapipe fully working in RenderDoc.

Fixes: 21864bdaaef6 ("llvmpipe: unmap display target of shader image/sampler")

Signed-off-by: Joshua Ashton <joshua at froggi.es>
Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11856>

---

 src/gallium/drivers/llvmpipe/lp_state_sampler.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/lp_state_sampler.c b/src/gallium/drivers/llvmpipe/lp_state_sampler.c
index c631d1148e7..9303e3bd7ec 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_sampler.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_sampler.c
@@ -422,10 +422,11 @@ llvmpipe_cleanup_stage_sampling(struct llvmpipe_context *ctx,
 
    for (i = 0; i < num; i++) {
       struct pipe_sampler_view *view = views[i];
-      assert(view);
-      struct pipe_resource *tex = view->texture;
-      if (tex)
-         llvmpipe_resource_unmap(tex, 0, 0);
+      if (view) {
+         struct pipe_resource *tex = view->texture;
+         if (tex)
+            llvmpipe_resource_unmap(tex, 0, 0);
+      }
    }
 }