diff options
| author | Jason Ekstrand <[email protected]> | 2020-01-07 14:54:26 -0600 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-01-13 17:23:47 +0000 |
| commit | e40b11bbcb02dde1a8f989ca6545e22414c6f4ce (patch) | |
| tree | 7b43b62263e3c856b4bc778de395002c3462a0d0 /src/amd | |
| parent | bd3ab75aef95d062cedaa92504fede9887a2c370 (diff) | |
nir: Rename nir_intrinsic_barrier to control_barrier
This is a more explicit name now that we don't want it to be doing any
memory barrier stuff for us.
Reviewed-by: Caio Marcelo de Oliveira Filho <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3307>
Diffstat (limited to 'src/amd')
| -rw-r--r-- | src/amd/compiler/aco_instruction_selection.cpp | 2 | ||||
| -rw-r--r-- | src/amd/llvm/ac_nir_to_llvm.c | 4 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_meta_fast_clear.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp index 29dea6e6cd3..a106631b4c1 100644 --- a/src/amd/compiler/aco_instruction_selection.cpp +++ b/src/amd/compiler/aco_instruction_selection.cpp @@ -5714,7 +5714,7 @@ void visit_intrinsic(isel_context *ctx, nir_intrinsic_instr *instr) case nir_intrinsic_get_buffer_size: visit_get_buffer_size(ctx, instr); break; - case nir_intrinsic_barrier: { + case nir_intrinsic_control_barrier: { unsigned* bsize = ctx->program->info->cs.block_size; unsigned workgroup_size = bsize[0] * bsize[1] * bsize[2]; if (workgroup_size > ctx->program->wave_size) diff --git a/src/amd/llvm/ac_nir_to_llvm.c b/src/amd/llvm/ac_nir_to_llvm.c index fb042ac1d4a..17c21cadad9 100644 --- a/src/amd/llvm/ac_nir_to_llvm.c +++ b/src/amd/llvm/ac_nir_to_llvm.c @@ -3555,7 +3555,7 @@ static void visit_intrinsic(struct ac_nir_context *ctx, break; case nir_intrinsic_memory_barrier_tcs_patch: break; - case nir_intrinsic_barrier: + case nir_intrinsic_control_barrier: ac_emit_barrier(&ctx->ac, ctx->stage); break; case nir_intrinsic_shared_atomic_add: @@ -4919,7 +4919,7 @@ scan_tess_ctrl(nir_cf_node *cf_node, unsigned *upper_block_tf_writemask, continue; nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr); - if (intrin->intrinsic == nir_intrinsic_barrier) { + if (intrin->intrinsic == nir_intrinsic_control_barrier) { /* If we find a barrier in nested control flow put this in the * too hard basket. In GLSL this is not possible but it is in diff --git a/src/amd/vulkan/radv_meta_fast_clear.c b/src/amd/vulkan/radv_meta_fast_clear.c index e0e83c2754f..8e54c7286aa 100644 --- a/src/amd/vulkan/radv_meta_fast_clear.c +++ b/src/amd/vulkan/radv_meta_fast_clear.c @@ -87,7 +87,7 @@ build_dcc_decompress_compute_shader(struct radv_device *dev) nir_intrinsic_instr *membar = nir_intrinsic_instr_create(b.shader, nir_intrinsic_memory_barrier); nir_builder_instr_insert(&b, &membar->instr); - nir_intrinsic_instr *bar = nir_intrinsic_instr_create(b.shader, nir_intrinsic_barrier); + nir_intrinsic_instr *bar = nir_intrinsic_instr_create(b.shader, nir_intrinsic_control_barrier); nir_builder_instr_insert(&b, &bar->instr); nir_ssa_def *outval = &tex->dest.ssa; |