Module: Mesa
Branch: master
Commit: 0c90264da4139805d34f530485a678c53809932e
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0c90264da4139805d34f530485a678c53809932e

Author: Timothy Arceri <tarc...@itsqueeze.com>
Date:   Thu Mar  8 09:46:42 2018 +1100

ac/radeonsi: add emit_kill to the abi

This should fix a regression with Rocket League grass rendering
on the NIR backend.

Reviewed-by: Marek Olšák <marek.ol...@amd.com>
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 29bffefd79..c785244dcc 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -3872,6 +3872,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)
 {
@@ -3886,7 +3892,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
@@ -6955,6 +6961,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 09fe32c136..901e49b1f9 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 343a5d57bf..fa7a19cb3a 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -6062,6 +6062,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;

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to