Mesa (master): nir: Work around MSVC x86 internal compiler error

[GitLab Mirror]

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

Author: Jesse Natalie <jenatali at microsoft.com>
Date:   Tue Jan 19 11:23:39 2021 -0800

nir: Work around MSVC x86 internal compiler error

Fixes: 1fd8b466 ("nir,spirv: add sparse image loads")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4108
Acked-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8581>

---

 src/compiler/nir/nir_lower_input_attachments.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/compiler/nir/nir_lower_input_attachments.c b/src/compiler/nir/nir_lower_input_attachments.c
index f18aac0df0d..2380b0cc88a 100644
--- a/src/compiler/nir/nir_lower_input_attachments.c
+++ b/src/compiler/nir/nir_lower_input_attachments.c
@@ -151,8 +151,9 @@ try_lower_input_load(nir_function_impl *impl, nir_intrinsic_instr *load,
 
    if (tex->is_sparse) {
       unsigned load_result_size = load->dest.ssa.num_components - 1;
+      unsigned load_result_mask = BITFIELD_MASK(load_result_size);
       nir_ssa_def *res = nir_channels(
-         &b, &tex->dest.ssa, BITFIELD_MASK(load_result_size) | 0x10);
+         &b, &tex->dest.ssa, load_result_mask | 0x10);
 
       nir_ssa_def_rewrite_uses(&load->dest.ssa, nir_src_for_ssa(res));
    } else {