OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/nir: Stop adding redundant barriers

Browse Source 
Now that both GLSL and SPIR-V are adding shared and tcs_patch barriers
(as appropreate) prior to the nir_intrinsic_barrier, we don't need to do
it ourselves in the back-end.  This reverts commit
26e950a5de01564e3b5f2148ae994454ae5205fe.

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3307>
This commit is contained in:
Jason Ekstrand
2020-01-07 14:58:45 -06:00
committed by Marge Bot
parent ba43b66dc9
commit bd3ab75aef
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/intel/compiler/brw_nir_lower_cs_intrinsics.c
View File

@@ -55,20 +55,6 @@ lower_cs_intrinsics_convert_block(struct lower_intrinsics_state *state,
nir_ssa_def *sysval; nir_ssa_def *sysval;
switch (intrinsic->intrinsic) { switch (intrinsic->intrinsic) {
case nir_intrinsic_barrier: {
/* Our HW barrier instruction doesn't do a memory barrier for us but
* the GLSL barrier() intrinsic does for shared memory. Insert a
* shared memory barrier before every barrier().
*/
b->cursor = nir_before_instr(&intrinsic->instr);
nir_intrinsic_instr *shared_barrier =
nir_intrinsic_instr_create(b->shader,
nir_intrinsic_memory_barrier_shared);
nir_builder_instr_insert(b, &shared_barrier->instr);
continue;
}
case nir_intrinsic_load_local_invocation_index: case nir_intrinsic_load_local_invocation_index:
case nir_intrinsic_load_local_invocation_id: { case nir_intrinsic_load_local_invocation_id: {
/* First time we are using those, so let's calculate them. */ /* First time we are using those, so let's calculate them. */