Module: Mesa Branch: staging/22.2 Commit: a606746bba239fa4f55f0f976e69bec006c07791 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a606746bba239fa4f55f0f976e69bec006c07791
Author: Lionel Landwerlin <[email protected]> Date: Thu Jul 7 09:35:38 2022 +0300 intel/fs: fix load_scratch intrinsic The selection of the internal opcode to deal with load_scratch is incorrect. Signed-off-by: Lionel Landwerlin <[email protected]> Fixes: c6439792287f ("intel/fs: Choose memory message type based on bit size") Reviewed-by: Caio Oliveira <[email protected]> Reviewed-by: Ivan Briano <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16964> (cherry picked from commit 46a13404c07acdb0412121a6ff55fdbcd5bfea5c) --- .pick_status.json | 2 +- src/intel/compiler/brw_fs_nir.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 3ef87a83084..aaa391f3641 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -11461,7 +11461,7 @@ "description": "intel/fs: fix load_scratch intrinsic", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "c6439792287f11f25cb2b62d699f52daefe54a44" }, diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp index 3a0af5007aa..5cafc75cd86 100644 --- a/src/intel/compiler/brw_fs_nir.cpp +++ b/src/intel/compiler/brw_fs_nir.cpp @@ -5215,7 +5215,7 @@ fs_visitor::nir_emit_intrinsic(const fs_builder &bld, nir_intrinsic_instr *instr bld.emit(SHADER_OPCODE_UNTYPED_SURFACE_READ_LOGICAL, dest, srcs, SURFACE_LOGICAL_NUM_SRCS); - } else if (nir_dest_bit_size(instr->dest) >= 4 && + } else if (nir_dest_bit_size(instr->dest) == 32 && nir_intrinsic_align(instr) >= 4) { /* The offset for a DWORD scattered message is in dwords. */ srcs[SURFACE_LOGICAL_SRC_ADDRESS] =
