From caf19bcf7beaf8eadb89ac96d0573fef1c00a4d3 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 3 Feb 2022 11:33:26 +0200 Subject: [PATCH] intel/fs: don't set allow_sample_mask for CS intrinsics Signed-off-by: Lionel Landwerlin Fixes: 77486db867bd ("intel/fs: Disable sample mask predication for scratch stores") Reviewed-by: Caio Oliveira Part-of: (cherry picked from commit c89024e4463389663cf7f7d2f2752de2029efb23) --- .pick_status.json | 2 +- src/intel/compiler/brw_fs_nir.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index ca83a705ce3..8fb5cfe731b 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -283,7 +283,7 @@ "description": "intel/fs: don't set allow_sample_mask for CS intrinsics", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "77486db867bd39aa9b76e549c946b0a165fcb21a" }, diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp index 7e48e213e8d..9376537bd44 100644 --- a/src/intel/compiler/brw_fs_nir.cpp +++ b/src/intel/compiler/brw_fs_nir.cpp @@ -3928,7 +3928,10 @@ fs_visitor::nir_emit_cs_intrinsic(const fs_builder &bld, srcs[SURFACE_LOGICAL_SRC_SURFACE] = brw_imm_ud(GFX7_BTI_SLM); srcs[SURFACE_LOGICAL_SRC_ADDRESS] = get_nir_src(instr->src[1]); srcs[SURFACE_LOGICAL_SRC_IMM_DIMS] = brw_imm_ud(1); - srcs[SURFACE_LOGICAL_SRC_ALLOW_SAMPLE_MASK] = brw_imm_ud(1); + /* No point in masking with sample mask, here we're handling compute + * intrinsics. + */ + srcs[SURFACE_LOGICAL_SRC_ALLOW_SAMPLE_MASK] = brw_imm_ud(0); fs_reg data = get_nir_src(instr->src[0]); data.type = brw_reg_type_from_bit_size(bit_size, BRW_REGISTER_TYPE_UD);