fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 03:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

panvk: Lower sampler and texture index in case of offset

Browse source 
We are going to move to run nir_lower_tex once and before
lower_descriptors.

To avoid needing to rerun it, let's never generate a sampler or texture
index in lower_descriptors when offset is present.

Signed-off-by: Mary Guillemard <mary.guillemard@collabora.com>
Reviewed-by: Olivia Lee <olivia.lee@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36776>
This commit is contained in:
Mary Guillemard 2025-08-13 14:09:46 +00:00 • committed by Marge Bot
parent 62bfd3f132
commit 04e9a93339
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/panfrost/vulkan/panvk_vX_nir_lower_descriptors.c
View file

@ -801,14 +801,14 @@ lower_tex(nir_builder *b, nir_tex_instr *tex, const struct lower_desc_ctx *ctx)
struct panvk_subdesc_info subdesc =
get_sampler_subdesc_info(bind_layout->type, plane);
uint32_t desc_stride = get_desc_array_stride(bind_layout, subdesc.type);
tex->sampler_index =
shader_desc_idx(set, binding, subdesc, ctx) +
index_imm * desc_stride;
uint32_t sampler_index = shader_desc_idx(set, binding, subdesc, ctx) + index_imm * desc_stride;
if (index_ssa != NULL) {
nir_def *offset = nir_imul_imm(b, index_ssa, desc_stride);
offset = nir_iadd_imm(b, offset, sampler_index);
nir_tex_instr_add_src(tex, nir_tex_src_sampler_offset, offset);
} else {
tex->sampler_index = sampler_index;
}
progress = true;
} else {
@ -834,14 +834,14 @@ lower_tex(nir_builder *b, nir_tex_instr *tex, const struct lower_desc_ctx *ctx)
struct panvk_subdesc_info subdesc =
get_tex_subdesc_info(bind_layout->type, plane);
uint32_t desc_stride = get_desc_array_stride(bind_layout, subdesc.type);
tex->texture_index =
shader_desc_idx(set, binding, subdesc, ctx) +
index_imm * desc_stride;
uint32_t texture_index = shader_desc_idx(set, binding, subdesc, ctx) + index_imm * desc_stride;
if (index_ssa != NULL) {
nir_def *offset = nir_imul_imm(b, index_ssa, desc_stride);
offset = nir_iadd_imm(b, offset, texture_index);
nir_tex_instr_add_src(tex, nir_tex_src_texture_offset, offset);
} else {
tex->texture_index = texture_index;
}
progress = true;
}