Mesa (master): etnaviv: explicitly set nir_variable_mode

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Jul 24 13:43:40 UTC 2020


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

Author: Christian Gmeiner <christian.gmeiner at gmail.com>
Date:   Mon Jul 20 21:40:16 2020 +0200

etnaviv: explicitly set nir_variable_mode

No functional changes - fixes the following assert:
  nir_lower_io_impl: Assertion `!(modes & ~supported_modes)' failed.

Signed-off-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Reviewed-by: Lucas Stach <l.stach at pengutronix.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5997>

---

 src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c
index 44e6c5ec9d5..ebaeb7bb5c8 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c
@@ -1088,7 +1088,7 @@ etna_compile_shader_nir(struct etna_shader_variant *v)
       assert(sf->num_reg == count);
    }
 
-   NIR_PASS_V(s, nir_lower_io, ~nir_var_shader_out, etna_glsl_type_size,
+   NIR_PASS_V(s, nir_lower_io, nir_var_shader_in | nir_var_uniform, etna_glsl_type_size,
             (nir_lower_io_options)0);
 
    NIR_PASS_V(s, nir_lower_regs_to_ssa);



More information about the mesa-commit mailing list