etnaviv: handle NULL views in set_sampler_views
Passing NULL for the views parameter should be the same as passing an
array of NULL, according to the documentation. So let's respect that
detail.
This fixes a crash when using GALLIUM_HUD. The wrong handling of views
parameter was causing problems starting with
2813688f8db ("gallium/hud: don't use cso_context to restore VBs, constbuf 0 and sampler views").
Cc: <mesa-stable@lists.freedesktop.org>
Fixes: c9e8b49b885 ("etnaviv: gallium driver for Vivante GPUs")
Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8670>
(cherry picked from commit 81ab9fe2d0c2c2d9961107c88209f2fff1f136c4)
diff --git a/.pick_status.json b/.pick_status.json
index 7be9040..9b33219 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -400,7 +400,7 @@
"description": "etnaviv: handle NULL views in set_sampler_views",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "c9e8b49b885242d84ba031dacef5aa4a5ac1e5b6"
},
diff --git a/src/gallium/drivers/etnaviv/etnaviv_texture.c b/src/gallium/drivers/etnaviv/etnaviv_texture.c
index 9202bda..ac3f852 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_texture.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_texture.c
@@ -247,8 +247,10 @@
uint32_t prev_active_sampler_views = ctx->active_sampler_views;
for (i = start, j = 0; j < nr; i++, j++, mask <<= 1) {
- pipe_sampler_view_reference(&ctx->sampler_view[i], views[j]);
- if (views[j]) {
+ struct pipe_sampler_view *view = views ? views[i] : NULL;
+
+ pipe_sampler_view_reference(&ctx->sampler_view[i], view);
+ if (view) {
ctx->active_sampler_views |= mask;
ctx->dirty_sampler_views |= mask;
} else
