diff options
author | Caio Marcelo de Oliveira Filho <[email protected]> | 2020-01-10 23:52:30 -0800 |
---|---|---|
committer | Caio Marcelo de Oliveira Filho <[email protected]> | 2020-01-14 14:42:12 -0800 |
commit | 3cc501be694e3434dcba0547153af1319503d655 (patch) | |
tree | 3cda2eb98691b9f47eefca4c968ef5d73abfa820 /src/compiler/nir/nir_opt_copy_prop_vars.c | |
parent | d8440a3d2f4fb8a0b816c8e0884738de9797f09d (diff) |
nir: Add missing nir_var_mem_global to various passes
Reviewed-by: Jason Ekstrand <[email protected]>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3322>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3322>
Diffstat (limited to 'src/compiler/nir/nir_opt_copy_prop_vars.c')
-rw-r--r-- | src/compiler/nir/nir_opt_copy_prop_vars.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/compiler/nir/nir_opt_copy_prop_vars.c b/src/compiler/nir/nir_opt_copy_prop_vars.c index 54fbad221a7..05bdec50f45 100644 --- a/src/compiler/nir/nir_opt_copy_prop_vars.c +++ b/src/compiler/nir/nir_opt_copy_prop_vars.c @@ -155,7 +155,8 @@ gather_vars_written(struct copy_prop_var_state *state, nir_var_shader_temp | nir_var_function_temp | nir_var_mem_ssbo | - nir_var_mem_shared; + nir_var_mem_shared | + nir_var_mem_global; continue; } @@ -168,7 +169,8 @@ gather_vars_written(struct copy_prop_var_state *state, case nir_intrinsic_memory_barrier: written->modes |= nir_var_shader_out | nir_var_mem_ssbo | - nir_var_mem_shared; + nir_var_mem_shared | + nir_var_mem_global; break; case nir_intrinsic_scoped_memory_barrier: @@ -788,7 +790,8 @@ copy_prop_vars_block(struct copy_prop_var_state *state, nir_var_shader_temp | nir_var_function_temp | nir_var_mem_ssbo | - nir_var_mem_shared); + nir_var_mem_shared | + nir_var_mem_global); if (debug) dump_copy_entries(copies); continue; } @@ -804,13 +807,15 @@ copy_prop_vars_block(struct copy_prop_var_state *state, apply_barrier_for_modes(copies, nir_var_shader_out | nir_var_mem_ssbo | - nir_var_mem_shared); + nir_var_mem_shared | + nir_var_mem_global); break; case nir_intrinsic_memory_barrier_buffer: if (debug) dump_instr(instr); - apply_barrier_for_modes(copies, nir_var_mem_ssbo); + apply_barrier_for_modes(copies, nir_var_mem_ssbo | + nir_var_mem_global); break; case nir_intrinsic_memory_barrier_shared: |