fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 11:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

etnaviv: fix vertex sampler setup

Browse source 
The start offset of the vertex samplers isn't zero, but the indexing of
the passed in views array is still zero based. Use the correct indexing
variable to fix vertex sampler setup.

Cc: <mesa-stable@lists.freedesktop.org>
Fixes: 81ab9fe2d0 ("etnaviv: handle NULL views in set_sampler_views")
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10724>
(cherry picked from commit 92ed827fbd)
This commit is contained in:
Lucas Stach 2021-05-10 12:15:46 +02:00 • committed by Eric Engestrom
parent 4cdf191b02
commit b22b11ffa4
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -544,7 +544,7 @@
"description": "etnaviv: fix vertex sampler setup",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "81ab9fe2d0c2c2d9961107c88209f2fff1f136c4"
},

2
src/gallium/drivers/etnaviv/etnaviv_texture.c
View file

@ -247,7 +247,7 @@ set_sampler_views(struct etna_context *ctx, unsigned start, unsigned end,
uint32_t prev_active_sampler_views = ctx->active_sampler_views;
for (i = start, j = 0; j < nr; i++, j++, mask <<= 1) {
struct pipe_sampler_view *view = views ? views[i] : NULL;
struct pipe_sampler_view *view = views ? views[j] : NULL;
pipe_sampler_view_reference(&ctx->sampler_view[i], view);
if (view) {