diff options
| author | Jason Ekstrand <jason@jlekstrand.net> | 2020-06-10 17:49:13 -0500 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-07-06 19:54:30 +0000 |
| commit | 4f521e596a3b0acb71617ddff1ad5333b57f80f3 (patch) | |
| tree | e45672b801fd4526222ed668c80b988514bf7f4d | |
| parent | 36a90468486252cb35cdea3d67ace991f1fb4bd0 (diff) | |
lima: Only call nir_lower_io on shader_in/out
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>
| -rw-r--r-- | src/gallium/drivers/lima/lima_program.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/lima/lima_program.c b/src/gallium/drivers/lima/lima_program.c index 0d942d47126..1bb1bd88622 100644 --- a/src/gallium/drivers/lima/lima_program.c +++ b/src/gallium/drivers/lima/lima_program.c @@ -101,7 +101,8 @@ lima_program_optimize_vs_nir(struct nir_shader *s) NIR_PASS_V(s, nir_lower_viewport_transform); NIR_PASS_V(s, nir_lower_point_size, 1.0f, 100.0f); - NIR_PASS_V(s, nir_lower_io, nir_var_all, type_size, 0); + NIR_PASS_V(s, nir_lower_io, + nir_var_shader_in | nir_var_shader_out, type_size, 0); NIR_PASS_V(s, nir_lower_load_const_to_scalar); NIR_PASS_V(s, lima_nir_lower_uniform_to_scalar); NIR_PASS_V(s, nir_lower_io_to_scalar, @@ -193,7 +194,8 @@ lima_program_optimize_fs_nir(struct nir_shader *s, bool progress; NIR_PASS_V(s, nir_lower_fragcoord_wtrans); - NIR_PASS_V(s, nir_lower_io, nir_var_all, type_size, 0); + NIR_PASS_V(s, nir_lower_io, + nir_var_shader_in | nir_var_shader_out, type_size, 0); NIR_PASS_V(s, nir_lower_regs_to_ssa); NIR_PASS_V(s, nir_lower_tex, tex_options); |