For the series: Reviewed-by: Marek Olšák <marek.ol...@amd.com>
Marek On Wed, Mar 7, 2018 at 6:04 PM, Timothy Arceri <tarc...@itsqueeze.com> wrote: > This should fix a regression with Rocket League grass rendering > on the NIR backend. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104717 > --- > src/amd/common/ac_nir_to_llvm.c | 9 ++++++++- > src/amd/common/ac_shader_abi.h | 2 ++ > src/gallium/drivers/radeonsi/si_shader.c | 1 + > 3 files changed, 11 insertions(+), 1 deletion(-) > > diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c > index 425970e609..e70e0c5488 100644 > --- a/src/amd/common/ac_nir_to_llvm.c > +++ b/src/amd/common/ac_nir_to_llvm.c > @@ -3844,6 +3844,12 @@ static void emit_barrier(struct ac_llvm_context *ac, > gl_shader_stage stage) > ac->voidt, NULL, 0, AC_FUNC_ATTR_CONVERGENT); > } > > +static void radv_emit_kill(struct ac_shader_abi *abi, LLVMValueRef visible) > +{ > + struct radv_shader_context *ctx = radv_shader_context_from_abi(abi); > + ac_build_kill_if_false(&ctx->ac, visible); > +} > + > static void emit_discard(struct ac_nir_context *ctx, > const nir_intrinsic_instr *instr) > { > @@ -3858,7 +3864,7 @@ static void emit_discard(struct ac_nir_context *ctx, > cond = LLVMConstInt(ctx->ac.i1, false, 0); > } > > - ac_build_kill_if_false(&ctx->ac, cond); > + ctx->abi->emit_kill(ctx->abi, cond); > } > > static LLVMValueRef > @@ -6888,6 +6894,7 @@ LLVMModuleRef > ac_translate_nir_to_llvm(LLVMTargetMachineRef tm, > ctx.abi.lookup_interp_param = lookup_interp_param; > ctx.abi.load_sample_position = load_sample_position; > ctx.abi.load_sample_mask_in = load_sample_mask_in; > + ctx.abi.emit_kill = radv_emit_kill; > } > > if (i) > diff --git a/src/amd/common/ac_shader_abi.h b/src/amd/common/ac_shader_abi.h > index ccf26648a2..4a29e0eb13 100644 > --- a/src/amd/common/ac_shader_abi.h > +++ b/src/amd/common/ac_shader_abi.h > @@ -86,6 +86,8 @@ struct ac_shader_abi { > void (*emit_primitive)(struct ac_shader_abi *abi, > unsigned stream); > > + void (*emit_kill)(struct ac_shader_abi *abi, LLVMValueRef visible); > + > LLVMValueRef (*load_inputs)(struct ac_shader_abi *abi, > unsigned location, > unsigned driver_location, > diff --git a/src/gallium/drivers/radeonsi/si_shader.c > b/src/gallium/drivers/radeonsi/si_shader.c > index 2e57eca6e5..306784aff4 100644 > --- a/src/gallium/drivers/radeonsi/si_shader.c > +++ b/src/gallium/drivers/radeonsi/si_shader.c > @@ -6058,6 +6058,7 @@ static bool si_compile_tgsi_main(struct > si_shader_context *ctx, > ctx->abi.lookup_interp_param = si_nir_lookup_interp_param; > ctx->abi.load_sample_position = load_sample_position; > ctx->abi.load_sample_mask_in = load_sample_mask_in; > + ctx->abi.emit_kill = si_llvm_emit_kill; > break; > case PIPE_SHADER_COMPUTE: > ctx->abi.load_local_group_size = get_block_size; > -- > 2.14.3 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
