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

agx: Ensure to lower 1D image load/store to 2D

Browse source 
This was missing from lower_images.
This fix a good chunk of Vulkan deQP failures with 1D images.

Signed-off-by: Mary <mary@mary.zone>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24847>
This commit is contained in:
Mary 2023-08-17 17:34:38 +02:00 • committed by Marge Bot
parent 8701ad4396
commit 0ec2183dfc
1 changed files with 36 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/asahi/compiler/agx_nir_lower_texture.c
View file

@ -285,6 +285,25 @@ lower_buffer_texture(nir_builder *b, nir_tex_instr *tex)
return true;
}
/*
* Given a 1D texture coordinate, calculate the 2D coordinate vector that
* will be used to access the linear 2D texture bound to the 1D texture.
*/
static nir_def *
coords_for_1d_texture(nir_builder *b, nir_def *coord, bool is_array)
{
/* Add a zero Y component to the coordinate */
if (is_array) {
assert(coord->num_components >= 2);
return nir_vec3(b, nir_channel(b, coord, 0),
nir_imm_intN_t(b, 0, coord->bit_size),
nir_channel(b, coord, 1));
} else {
assert(coord->num_components >= 1);
return nir_vec2(b, coord, nir_imm_intN_t(b, 0, coord->bit_size));
}
}
/*
* NIR indexes into array textures with unclamped floats (integer for txf). AGX
* requires the index to be a clamped integer. Lower tex_src_coord into
@ -317,16 +336,7 @@ lower_regular_texture(nir_builder *b, nir_instr *instr, UNUSED void *data)
* always lower to 2D.
*/
if (tex->sampler_dim == GLSL_SAMPLER_DIM_1D) {
/* Add a zero Y component to the coordinate */
if (tex->is_array) {
assert(coord->num_components == 2);
coord = nir_vec3(b, nir_channel(b, coord, 0),
nir_imm_intN_t(b, 0, coord->bit_size),
nir_channel(b, coord, 1));
} else {
assert(coord->num_components == 1);
coord = nir_vec2(b, coord, nir_imm_intN_t(b, 0, coord->bit_size));
}
coord = coords_for_1d_texture(b, coord, tex->is_array);
/* Add a zero Y component to other sources */
nir_tex_src_type other_srcs[] = {
@ -726,6 +736,21 @@ lower_buffer_image(nir_builder *b, nir_intrinsic_instr *intr)
return true;
}
static bool
lower_1d_image(nir_builder *b, nir_intrinsic_instr *intr)
{
if (nir_intrinsic_image_dim(intr) != GLSL_SAMPLER_DIM_1D)
return false;
nir_def *coord = intr->src[1].ssa;
bool is_array = nir_intrinsic_image_array(intr);
nir_def *coord2d = coords_for_1d_texture(b, coord, is_array);
nir_src_rewrite(&intr->src[1], nir_pad_vector(b, coord2d, 4));
nir_intrinsic_set_image_dim(intr, GLSL_SAMPLER_DIM_2D);
return true;
}
static bool
lower_images(nir_builder *b, nir_instr *instr, UNUSED void *data)
{
@ -740,7 +765,7 @@ lower_images(nir_builder *b, nir_instr *instr, UNUSED void *data)
case nir_intrinsic_image_store:
case nir_intrinsic_bindless_image_load:
case nir_intrinsic_bindless_image_store:
return lower_buffer_image(b, intr);
return lower_buffer_image(b, intr) || lower_1d_image(b, intr);
case nir_intrinsic_image_size:
case nir_intrinsic_bindless_image_size: