v3d/v3dv: drop unused UIF XOR disable plumbing

uif_xor_disable setup was dropped in commit 2e746bc63d.
This cleans up the remaining code that still uses uif_xor_disable.

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40330>
This commit is contained in:
Daivik Bhatia 2026-03-10 23:53:58 +05:30 committed by Marge Bot
parent f65290f6f9
commit fcd280f286
2 changed files with 9 additions and 13 deletions

View file

@ -54,16 +54,12 @@ pack_texture_shader_state_helper(struct v3dv_device *device,
tex.level_0_xor_enable = (image->planes[iplane].slices[0].tiling == V3D_TILING_UIF_XOR);
if (tex.level_0_is_strictly_uif)
tex.level_0_ub_pad = image->planes[iplane].slices[0].ub_pad;
/* FIXME: v3d never sets uif_xor_disable, but uses it on the following
* check so let's set the default value
/* If we ever set tex.uif_xor_disable we also need to flag
* tex.extended here.
*/
tex.uif_xor_disable = false;
if (tex.uif_xor_disable ||
tex.level_0_is_strictly_uif) {
tex.extended = true;
if (tex.level_0_is_strictly_uif) {
tex.level_0_ub_pad = image->planes[iplane].slices[0].ub_pad;
tex.extended = true;
}
tex.base_level = image_view->vk.base_mip_level;

View file

@ -971,11 +971,11 @@ v3d_setup_texture_shader_state(const struct v3d_device_info *devinfo,
rsc->slices[0].tiling == V3D_TILING_UIF_NO_XOR);
tex->level_0_xor_enable = (rsc->slices[0].tiling == V3D_TILING_UIF_XOR);
if (tex->level_0_is_strictly_uif)
/* If we ever set tex.uif_xor_disable we also need to flag
* tex.extended here.
*/
if (tex->level_0_is_strictly_uif) {
tex->level_0_ub_pad = rsc->slices[0].ub_pad;
if (tex->uif_xor_disable ||
tex->level_0_is_strictly_uif) {
tex->extended = true;
}
}