Mesa (master): etnaviv: fix TS samplers on GC7000L

[GitLab Mirror]

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

Author: Jonathan Marek <jonathan at marek.ca>
Date:   Mon Sep  2 16:23:21 2019 -0400

etnaviv: fix TS samplers on GC7000L

Signed-off-by: Jonathan Marek <jonathan at marek.ca>
Reviewed-by: Lucas Stach <l.stach at pengutronix.de>

---

 src/gallium/drivers/etnaviv/etnaviv_texture_desc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/etnaviv/etnaviv_texture_desc.c b/src/gallium/drivers/etnaviv/etnaviv_texture_desc.c
index f4f059a3c5d..05b6de44f91 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_texture_desc.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_texture_desc.c
@@ -245,7 +245,8 @@ etna_emit_texture_desc(struct etna_context *ctx)
             struct etna_sampler_view_desc *sv = etna_sampler_view_desc(ctx->sampler_view[x]);
             etna_set_state(stream, VIVS_NTE_DESCRIPTOR_TX_CTRL(x),
                COND(sv->ts.enable, VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_ENABLE) |
-               VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_MODE(sv->ts.mode));
+               VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_MODE(sv->ts.mode) |
+               VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_INDEX(x));
             etna_set_state(stream, VIVS_NTE_DESCRIPTOR_SAMP_CTRL0(x), ss->SAMP_CTRL0 | sv->SAMP_CTRL0);
             etna_set_state(stream, VIVS_NTE_DESCRIPTOR_SAMP_CTRL1(x), ss->SAMP_CTRL1 | sv->SAMP_CTRL1);
             etna_set_state(stream, VIVS_NTE_DESCRIPTOR_SAMP_LOD_MINMAX(x), ss->SAMP_LOD_MINMAX);