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

asahi: allow lowering bindings after lowering textures

Browse source 
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27616>
This commit is contained in:
Alyssa Rosenzweig 2024-01-30 20:25:51 -04:00 • committed by Marge Bot
parent 17896f1699
commit 2da426afe0
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/drivers/asahi/agx_nir_lower_bindings.c
View file

@ -122,8 +122,9 @@ lower(nir_builder *b, nir_instr *instr, void *data)
* The GL spec says out-of-bounds image indexing is undefined, but
* faulting is not acceptable for robustness.
*/
index =
nir_umin(b, index, nir_imm_int(b, b->shader->info.num_images - 1));
index = nir_umin(
b, index,
nir_imm_intN_t(b, b->shader->info.num_images - 1, index->bit_size));
index = nir_iadd_imm(b, nir_imul_imm(b, index, 2), offset);
nir_src_rewrite(&intr->src[0], nir_load_texture_handle_agx(b, index));
@ -155,8 +156,9 @@ lower(nir_builder *b, nir_instr *instr, void *data)
index = nir_imm_int(b, tex->texture_index);
/* As above */
index =
nir_umin(b, index, nir_imm_int(b, b->shader->info.num_textures - 1));
index = nir_umin(
b, index,
nir_imm_intN_t(b, b->shader->info.num_textures - 1, index->bit_size));
nir_tex_instr_add_src(tex, nir_tex_src_texture_handle,
nir_load_texture_handle_agx(b, index));

5
src/gallium/drivers/asahi/agx_nir_lower_sysvals.c
View file

@ -117,8 +117,9 @@ load_texture_handle(nir_builder *b, nir_intrinsic_instr *intr, void *base)
nir_load_sysval_agx(b, 1, 64, .desc_set = stage_table(b),
.binding = (uintptr_t)base, .flags = ~0);
return nir_vec2(b, nir_u2u32(b, uniform),
nir_imul_imm(b, intr->src[0].ssa, AGX_TEXTURE_DESC_STRIDE));
return nir_vec2(
b, nir_u2u32(b, uniform),
nir_imul_imm(b, nir_u2u32(b, intr->src[0].ssa), AGX_TEXTURE_DESC_STRIDE));
}
static nir_def *