nouveau: Only call nir_lower_io on shader_in/out
authorJason Ekstrand <jason@jlekstrand.net>
Wed, 10 Jun 2020 22:50:37 +0000 (17:50 -0500)
committerMarge Bot <eric+marge@anholt.net>
Mon, 6 Jul 2020 19:54:30 +0000 (19:54 +0000)
Gallium drivers should never see nir_var_uniform because gallium lowers
regular uniforms to a UBO.  No GL driver should ever see either
nir_var_mem_shared because that's lowered in GLSL IR.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5418>

src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp

index c914ae4b8e243e72bfc2044d8b87361e0c01ac59..c634978497d708c05582252954c1b52a4b2036ae 100644 (file)
@@ -3129,7 +3129,9 @@ Converter::run()
       .ballot_bit_size = 32,
    };
 
-   NIR_PASS_V(nir, nir_lower_io, nir_var_all, type_size, (nir_lower_io_options)0);
+   NIR_PASS_V(nir, nir_lower_io,
+              (nir_variable_mode)(nir_var_shader_in | nir_var_shader_out),
+              type_size, (nir_lower_io_options)0);
    NIR_PASS_V(nir, nir_lower_subgroups, &subgroup_options);
    NIR_PASS_V(nir, nir_lower_regs_to_ssa);
    NIR_PASS_V(nir, nir_lower_load_const_to_scalar);