AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ac/surface: select a different swizzle mode for ASTC formats on GFX12

Browse Source 
It seems only 4KiB swizzle works fine with ASTC.

Cc: mesa-stable
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34877>
This commit is contained in:
Samuel Pitoiset
2025-07-03 10:44:06 +02:00
committed by Marge Bot
parent 15f6652e12
commit 2af3ef9305
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/amd/common/ac_surface.c
View File

@@ -804,6 +804,29 @@ static unsigned bpe_to_format(struct radeon_surf *surf)
return ADDR_FMT_INVALID;
}
static bool
is_astc_format(unsigned format)
{
switch (format) {
case ADDR_FMT_ASTC_5x4:
case ADDR_FMT_ASTC_5x5:
case ADDR_FMT_ASTC_6x5:
case ADDR_FMT_ASTC_6x6:
case ADDR_FMT_ASTC_8x5:
case ADDR_FMT_ASTC_8x6:
case ADDR_FMT_ASTC_8x8:
case ADDR_FMT_ASTC_10x5:
case ADDR_FMT_ASTC_10x6:
case ADDR_FMT_ASTC_10x8:
case ADDR_FMT_ASTC_10x10:
case ADDR_FMT_ASTC_12x10:
case ADDR_FMT_ASTC_12x12:
return true;
default:
return false;
}
}
/* The addrlib pitch alignment is forced to this number for all chips to support interop
* between any 2 chips.
*/
@@ -3376,6 +3399,8 @@ static bool gfx12_compute_surface(struct ac_addrlib *addrlib, const struct radeo
AddrSurfInfoIn.swizzleMode = ADDR3_LINEAR;
} else if (surf->flags & RADEON_SURF_VIDEO_REFERENCE) {
AddrSurfInfoIn.swizzleMode = ADDR3_256B_2D;
} else if (is_astc_format(AddrSurfInfoIn.format)) {
AddrSurfInfoIn.swizzleMode = config->is_3d ? ADDR3_4KB_3D : ADDR3_4KB_2D;
} else {
AddrSurfInfoIn.swizzleMode = gfx12_select_swizzle_mode(addrlib, info, config, surf,
&AddrSurfInfoIn, surf->flags);