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

intel/isl: Fix miptail selection for compressed textures

Browse source 
When determining if an LOD can fit within a miptail, we must minify in
pixel space and then convert to elements.

Prevents the following test case from failing when Yf is force-enabled:

   dEQP-VK.image.texel_view_compatible.graphic.extended.3d_image.texture_read.astc_8x5_srgb_block.r32g32b32a32_uint

Fixes: 46f45d62d1 ("intel/isl: Start using miptails")
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Rohan Garg <rohan.garg@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
(cherry picked from commit add742fca6)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39745>
This commit is contained in:
Nanley Chery 2025-10-14 06:50:31 -04:00 • committed by Dylan Baker
parent 28e38d3331
commit bca0d20d57
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1194,7 +1194,7 @@
"description": "intel/isl: Fix miptail selection for compressed textures", "description": "intel/isl: Fix miptail selection for compressed textures",
"nominated": true, "nominated": true,
"nomination_type": 2, "nomination_type": 2,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": "46f45d62d1bc78dfdd8bf9300584a01541f7660f", "because_sha": "46f45d62d1bc78dfdd8bf9300584a01541f7660f",
"notes": null "notes": null

17
src/intel/isl/isl.c
View file

@ -2349,12 +2349,6 @@ isl_choose_miptail_start_level(const struct isl_device *dev,
/* Account for the specified minimum */ /* Account for the specified minimum */
min_miptail_start = MAX(min_miptail_start, info->min_miptail_start_level); min_miptail_start = MAX(min_miptail_start, info->min_miptail_start_level);
struct isl_extent3d level0_extent_el = {
.w = isl_align_div_npot(info->width, fmtl->bw),
.h = isl_align_div_npot(info->height, fmtl->bh),
.d = isl_align_div_npot(info->depth, fmtl->bd),
};
/* The first miptail slot takes up the entire right side of the tile. So, /* The first miptail slot takes up the entire right side of the tile. So,
* the extent is just the distance from the offset of the first level to * the extent is just the distance from the offset of the first level to
* the corner of the tile. * the corner of the tile.
@ -2374,9 +2368,14 @@ isl_choose_miptail_start_level(const struct isl_device *dev,
/* Now find the first level that fits the maximum miptail size requirement. /* Now find the first level that fits the maximum miptail size requirement.
*/ */
for (uint32_t s = min_miptail_start; s < info->levels; s++) { for (uint32_t s = min_miptail_start; s < info->levels; s++) {
if (isl_minify(level0_extent_el.w, s) <= miptail_level0_extent_el.w && struct isl_extent3d level_s_extent_el = {
isl_minify(level0_extent_el.h, s) <= miptail_level0_extent_el.h && .w = isl_align_div_npot(isl_minify(info->width, s), fmtl->bw),
isl_minify(level0_extent_el.d, s) <= miptail_level0_extent_el.d) .h = isl_align_div_npot(isl_minify(info->height, s), fmtl->bh),
.d = isl_align_div_npot(isl_minify(info->depth, s), fmtl->bd),
};
if (level_s_extent_el.w <= miptail_level0_extent_el.w &&
level_s_extent_el.h <= miptail_level0_extent_el.h &&
level_s_extent_el.d <= miptail_level0_extent_el.d)
return s; return s;
} }