Mesa (main): r600/sfn: Lower offset in TXF instructions

[GitLab Mirror]

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

Author: Gert Wollny <gert.wollny at collabora.com>
Date:   Tue Jun 29 14:28:51 2021 +0200

r600/sfn: Lower offset in TXF instructions

Closes: #4960
Signed-off-by: Gert Wollny <gert.wollny at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11639>

---

 src/gallium/drivers/r600/sfn/sfn_nir.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/r600/sfn/sfn_nir.cpp b/src/gallium/drivers/r600/sfn/sfn_nir.cpp
index bf8588a6227..8b7ef194a2d 100644
--- a/src/gallium/drivers/r600/sfn/sfn_nir.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_nir.cpp
@@ -851,9 +851,10 @@ int r600_shader_from_nir(struct r600_context *rctx,
    NIR_PASS_V(sel->nir, r600_lower_shared_io);
    NIR_PASS_V(sel->nir, r600_nir_lower_atomics);
 
-   static const struct nir_lower_tex_options lower_tex_options = {
-      .lower_txp = ~0u,
-   };
+   struct nir_lower_tex_options lower_tex_options;
+   lower_tex_options.lower_txp = ~0u;
+   lower_tex_options.lower_txf_offset = true;
+
    NIR_PASS_V(sel->nir, nir_lower_tex, &lower_tex_options);
    NIR_PASS_V(sel->nir, r600::r600_nir_lower_txl_txf_array_or_cube);
    NIR_PASS_V(sel->nir, r600::r600_nir_lower_cube_to_2darray);