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

ac/nir: fix computing cube derivatives when the major axis is negative

Browse source 
This corresponds to the face 1.0, 3.0 or 5.0.

Cc: mesa-stable
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
(cherry picked from commit de64c7238a)

Conflicts:
	src/amd/ci/radv-fails.txt

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39462>
This commit is contained in:
Samuel Pitoiset 2026-01-13 17:46:47 +01:00 • committed by Dylan Baker
parent a4bee254c5
commit ef8d16611f
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -374,7 +374,7 @@
"description": "ac/nir: fix computing cube derivatives when the major axis is negative",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

2
src/amd/ci/radv-fails.txt
View file

@ -1,2 +0,0 @@
# RADV bug
dEQP-VK.texture.mipmap.cubemap.misc.projected_derivatives,Fail

12
src/amd/common/nir/ac_nir_lower_tex.c
View file

@ -47,8 +47,11 @@ build_cube_select(nir_builder *b, nir_def *ma, nir_def *id, nir_def *deriv,
nir_bcsel(b, is_ma_positive, nir_imm_float(b, 1.0), nir_imm_float(b, -1.0));
nir_def *neg_sgn_ma = nir_fneg(b, sgn_ma);
nir_def *is_ma_z = nir_fge_imm(b, id, 4.0);
nir_def *is_ma_y = nir_fge_imm(b, id, 2.0);
nir_def *face_id_half = nir_fmul_imm(b, id, 0.5);
nir_def *face_id_pos = nir_ftrunc(b, face_id_half);
nir_def *face_neg = nir_fneu(b, face_id_pos, face_id_half);
nir_def *is_ma_z = nir_fge_imm(b, face_id_pos, 2.0);
nir_def *is_ma_y = nir_fge_imm(b, face_id_pos, 1.0);
is_ma_y = nir_iand(b, is_ma_y, nir_inot(b, is_ma_z));
nir_def *is_not_ma_x = nir_ior(b, is_ma_z, is_ma_y);
@ -65,7 +68,10 @@ build_cube_select(nir_builder *b, nir_def *ma, nir_def *id, nir_def *deriv,
/* Select ma */
tmp = nir_bcsel(b, is_ma_z, deriv_z, nir_bcsel(b, is_ma_y, deriv_y, deriv_x));
*out_ma = nir_fmul_imm(b, nir_fabs(b, tmp), 2.0);
sgn = nir_bcsel(b, face_neg, nir_imm_float(b, -1.0), sgn_ma);
*out_ma = nir_fmul(b, tmp, sgn);
*out_ma = nir_fmul_imm(b, *out_ma, 2.0);
}
static void