Mesa (master): r600/sfn: lower all IO in one pass

[GitLab Mirror]

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

Author: Gert Wollny <gert.wollny at collabora.com>
Date:   Thu Nov 26 17:30:34 2020 +0100

r600/sfn: lower all IO in one pass

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

---

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

diff --git a/src/gallium/drivers/r600/sfn/sfn_nir.cpp b/src/gallium/drivers/r600/sfn/sfn_nir.cpp
index fc7c9909b66..853bd7b0994 100644
--- a/src/gallium/drivers/r600/sfn/sfn_nir.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_nir.cpp
@@ -822,12 +822,9 @@ int r600_shader_from_nir(struct r600_context *rctx,
    NIR_PASS_V(sel->nir, r600_nir_lower_int_tg4);
    NIR_PASS_V(sel->nir, r600_nir_lower_pack_unpack_2x16);
 
-   NIR_PASS_V(sel->nir, nir_lower_io, nir_var_uniform, r600_glsl_type_size,
-              nir_lower_io_lower_64bit_to_32);
-
-   nir_variable_mode io_modes = (nir_variable_mode)0;
+   nir_variable_mode io_modes = nir_var_uniform;
    if (sel->nir->info.stage != MESA_SHADER_VERTEX)
-      io_modes = nir_var_shader_in;
+      io_modes |= nir_var_shader_in;
 
    if (sel->nir->info.stage != MESA_SHADER_FRAGMENT)
       io_modes |= nir_var_shader_out;