OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: tidy up swizzle in radv_set_mutable_tex_desc_fields()

Browse Source 
To be closer to the RadeonSI helper.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29286>
This commit is contained in:
Samuel Pitoiset
2024-05-20 09:28:45 +02:00
committed by Marge Bot
parent 81e927ea05
commit d1fa5ffab0
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/amd/vulkan/radv_image_view.c
View File

@@ -118,8 +118,6 @@ radv_set_mutable_tex_desc_fields(struct radv_device *device, struct radv_image *
}
state[0] = va >> 8;
if (gfx_level >= GFX9 || base_level_info->mode == RADEON_SURF_MODE_2D)
state[0] |= swizzle;
state[1] &= C_008F14_BASE_ADDRESS_HI;
state[1] |= S_008F14_BASE_ADDRESS_HI(va >> 40);
@@ -168,6 +166,8 @@ radv_set_mutable_tex_desc_fields(struct radv_device *device, struct radv_image *
}
if (gfx_level >= GFX10) {
state[0] |= swizzle;
state[3] &= C_00A00C_SW_MODE;
if (is_stencil) {
@@ -195,6 +195,8 @@ radv_set_mutable_tex_desc_fields(struct radv_device *device, struct radv_image *
state[7] = meta_va >> 16;
} else if (gfx_level == GFX9) {
state[0] |= swizzle;
state[3] &= C_008F1C_SW_MODE;
state[4] &= C_008F20_PITCH;
@@ -224,6 +226,10 @@ radv_set_mutable_tex_desc_fields(struct radv_device *device, struct radv_image *
unsigned pitch = base_level_info->nblk_x * block_width;
unsigned index = ac_tile_mode_index(&plane->surface, base_level, is_stencil);
/* Only macrotiled modes can set tile swizzle. */
if (base_level_info->mode == RADEON_SURF_MODE_2D)
state[0] |= swizzle;
state[3] &= C_008F1C_TILING_INDEX;
state[3] |= S_008F1C_TILING_INDEX(index);
state[4] &= C_008F20_PITCH;