diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2018-03-09 16:56:31 +0100 |
|---|---|---|
| committer | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2018-03-13 14:05:06 +0100 |
| commit | 8e15824b9d73660db2ed41233d38c57cc43c9842 (patch) | |
| tree | 6dee5f9bccf2b92bfe60f478898bb17f04871da7 | |
| parent | 4e3117b7189fd787fdcb9c9512216215b225d200 (diff) | |
ac/nir: make emit_barrier() non-static
Required in order to move all RADV specific code outside of ac/nir.
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
| -rw-r--r-- | src/amd/common/ac_nir_to_llvm.c | 8 | ||||
| -rw-r--r-- | src/amd/common/ac_nir_to_llvm.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c index 73bd172a784..ceda8c540d6 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -3809,7 +3809,7 @@ static void emit_membar(struct ac_llvm_context *ac, ac_build_waitcnt(ac, waitcnt); } -static void emit_barrier(struct ac_llvm_context *ac, gl_shader_stage stage) +void ac_emit_barrier(struct ac_llvm_context *ac, gl_shader_stage stage) { /* SI only (thanks to a hw bug workaround): * The real barrier instruction isn’t needed, because an entire patch @@ -4534,7 +4534,7 @@ static void visit_intrinsic(struct ac_nir_context *ctx, emit_membar(&ctx->ac, instr); break; case nir_intrinsic_barrier: - emit_barrier(&ctx->ac, ctx->stage); + ac_emit_barrier(&ctx->ac, ctx->stage); break; case nir_intrinsic_shared_atomic_add: case nir_intrinsic_shared_atomic_imin: @@ -6318,7 +6318,7 @@ write_tess_factors(struct radv_shader_context *ctx) LLVMValueRef lds_base, lds_inner = NULL, lds_outer, byteoffset, buffer; LLVMValueRef out[6], vec0, vec1, tf_base, inner[4], outer[4]; int i; - emit_barrier(&ctx->ac, ctx->stage); + ac_emit_barrier(&ctx->ac, ctx->stage); switch (ctx->options->key.tcs.primitive_mode) { case GL_ISOLINES: @@ -6891,7 +6891,7 @@ LLVMModuleRef ac_translate_nir_to_llvm(LLVMTargetMachineRef tm, } if (i) - emit_barrier(&ctx.ac, ctx.stage); + ac_emit_barrier(&ctx.ac, ctx.stage); ac_setup_rings(&ctx); diff --git a/src/amd/common/ac_nir_to_llvm.h b/src/amd/common/ac_nir_to_llvm.h index ee73d1cbbcd..ebe18febbf2 100644 --- a/src/amd/common/ac_nir_to_llvm.h +++ b/src/amd/common/ac_nir_to_llvm.h @@ -248,6 +248,8 @@ ac_handle_shader_output_decl(struct ac_llvm_context *ctx, struct nir_variable *variable, gl_shader_stage stage); +void ac_emit_barrier(struct ac_llvm_context *ac, gl_shader_stage stage); + bool ac_lower_subgroups(struct nir_shader *shader); #endif /* AC_NIR_TO_LLVM_H */ |