From fe8c524c826dc1014e51671d04cc609335095887 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 10 Nov 2020 10:13:53 -0600 Subject: [PATCH] intel/fs: Fix use of undefined value in fixup_nomask_control_flow Fixes: a8ac0bd759cbf "intel/fs/gen12: Workaround unwanted SEND execution..." Reviewed-by: Caio Marcelo de Oliveira Filho Part-of: (cherry picked from commit e9caba6ce54d35870ef2fc555d00e2ccb45e40c0) --- .pick_status.json | 2 +- src/intel/compiler/brw_fs.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 3d92991fa38..61e892c4293 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -778,7 +778,7 @@ "description": "intel/fs: Fix use of undefined value in fixup_nomask_control_flow", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "a8ac0bd759cbf9a5984df4bc9f553a3dca41a8ab" }, diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp index 1124a245f90..6a77c3afd58 100644 --- a/src/intel/compiler/brw_fs.cpp +++ b/src/intel/compiler/brw_fs.cpp @@ -7800,7 +7800,8 @@ fs_visitor::fixup_3src_null_dest() static const fs_inst * find_halt_control_flow_region_start(const fs_visitor *v) { - if (brw_wm_prog_data(v->prog_data)->uses_kill) { + if (v->stage == MESA_SHADER_FRAGMENT && + brw_wm_prog_data(v->prog_data)->uses_kill) { foreach_block_and_inst(block, fs_inst, inst, v->cfg) { if (inst->opcode == FS_OPCODE_DISCARD_JUMP || inst->opcode == FS_OPCODE_PLACEHOLDER_HALT)