From 22bbc8f87b7deb2f65c76630e132980a813dba68 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Fri, 6 Dec 2024 13:03:48 +0100 Subject: [PATCH] panvk: Don't define push_constant range/base when we don't have to We just removed a lowering pass making use of these because base/range are not updated by some other lowering passes, so let's not encourage future use of base/range by keeping them set to zero. Signed-off-by: Boris Brezillon Reviewed-by: Chia-I Wu Reviewed-by: Mary Guillemard Reviewed-by: Lars-Ivar Hesselberg Simonsen Part-of: --- src/panfrost/vulkan/panvk_vX_blend.c | 5 ++--- src/panfrost/vulkan/panvk_vX_cmd_fb_preload.c | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/panfrost/vulkan/panvk_vX_blend.c b/src/panfrost/vulkan/panvk_vX_blend.c index a77916f97c2..898da86cc38 100644 --- a/src/panfrost/vulkan/panvk_vX_blend.c +++ b/src/panfrost/vulkan/panvk_vX_blend.c @@ -38,10 +38,9 @@ lower_load_blend_const(nir_builder *b, nir_instr *instr, UNUSED void *data) unsigned offset = offsetof(struct panvk_graphics_sysvals, blend.constants); nir_def *blend_consts = nir_load_push_constant( - b, intr->def.num_components, intr->def.bit_size, nir_imm_int(b, 0), + b, intr->def.num_components, intr->def.bit_size, /* Push constants are placed first, and then come the sysvals. */ - .base = offset + SYSVALS_PUSH_CONST_BASE, - .range = intr->def.num_components * intr->def.bit_size / 8); + nir_imm_int(b, SYSVALS_PUSH_CONST_BASE + offset)); nir_def_rewrite_uses(&intr->def, blend_consts); return true; diff --git a/src/panfrost/vulkan/panvk_vX_cmd_fb_preload.c b/src/panfrost/vulkan/panvk_vX_cmd_fb_preload.c index fb4ab308d9e..3e949cd68b1 100644 --- a/src/panfrost/vulkan/panvk_vX_cmd_fb_preload.c +++ b/src/panfrost/vulkan/panvk_vX_cmd_fb_preload.c @@ -83,8 +83,7 @@ static nir_def * get_layer_id(nir_builder *b) { #if PAN_ARCH <= 7 - return nir_load_push_constant(b, 1, 32, nir_imm_int(b, 0), .base = 0, - .range = 4); + return nir_load_push_constant(b, 1, 32, nir_imm_int(b, 0)); #else return nir_load_layer_id(b); #endif