From f9201eb7d33bb2acb2ed3c4e30daafe6bc1aec30 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sun, 22 Sep 2024 21:38:02 -0400 Subject: [PATCH] asahi,hk: fix st_tile mask size Signed-off-by: Alyssa Rosenzweig Part-of: --- src/asahi/vulkan/hk_cmd_meta.c | 2 +- src/gallium/drivers/asahi/agx_blit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/asahi/vulkan/hk_cmd_meta.c b/src/asahi/vulkan/hk_cmd_meta.c index b8b2d5e9c88..88b9f84bb3d 100644 --- a/src/asahi/vulkan/hk_cmd_meta.c +++ b/src/asahi/vulkan/hk_cmd_meta.c @@ -589,7 +589,7 @@ build_image_copy_shader(const struct vk_meta_image_copy_key *key) if (key->block_based) { /* Must define the phi first so we validate. */ nir_def *phi = nir_if_phi(b, value1, value2); - nir_def *mask = nir_imm_int(b, 1 << s); + nir_def *mask = nir_imm_intN_t(b, 1 << s, 16); nir_store_local_pixel_agx(b, phi, mask, lid, .base = 0, .write_mask = 0xf, .format = isa_format, diff --git a/src/gallium/drivers/asahi/agx_blit.c b/src/gallium/drivers/asahi/agx_blit.c index 3055745b321..7334ba2c36a 100644 --- a/src/gallium/drivers/asahi/agx_blit.c +++ b/src/gallium/drivers/asahi/agx_blit.c @@ -208,7 +208,7 @@ asahi_blit_compute_shader(struct pipe_context *ctx, struct asahi_blit_key *key) enum pipe_format tib_format = ail_pixel_format[effective_format(key->dst_format)].renderable; - nir_store_local_pixel_agx(b, color, nir_imm_int(b, 1), lid, .base = 0, + nir_store_local_pixel_agx(b, color, nir_imm_intN_t(b, 1, 16), lid, .base = 0, .write_mask = 0xf, .format = tib_format, .explicit_coord = true);