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

blorp: Fix Tile64 clear redescription assertion

Browse source 
Prevent assert failures in a future commit where Tile64 will be selected
more often.

Fixes: 42ef23ecd1 ("intel/blorp: Don't redescribe some Tile64 clears")
Reviewed-by: Rohan Garg <rohan.garg@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
(cherry picked from commit 6fc0e5c0aa)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39745>
This commit is contained in:
Nanley Chery 2025-10-13 23:03:27 -04:00 • committed by Dylan Baker
parent bca0d20d57
commit 7ab6074db0
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1094,7 +1094,7 @@
"description": "blorp: Fix Tile64 clear redescription assertion",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "42ef23ecd1a077a5564c6cd4a31ecf00f234a615",
"notes": null

11
src/intel/blorp/blorp_clear.c
View file

@ -527,14 +527,11 @@ blorp_fast_clear(struct blorp_batch *batch,
size_B = end_tile_B - start_tile_B;
addr.offset += start_tile_B;
} else if (isl_tiling_is_64(surf->surf->tiling)) {
/* If not supported above, clear the range without redescription. If
* the image is 3D, redescription is not possible because multiple
* depth slices are non-trivially interleaved into one plane. If the
* image is part of a miptail, there should be no benefit from
* redescription.
/* If not supported above, clear the range without redescription.
* Thankfully, we haven't run into this outside of conformance tests.
*/
assert(surf->surf->logical_level0_px.d > 1 ||
level <= surf->surf->miptail_start_level);
assert(surf->surf->levels > 1 ||
surf->surf->logical_level0_px.d != num_layers);
} else if (level == 0 && start_layer == 0 && num_layers == 1) {
assert(surf->surf->tiling == ISL_TILING_4 ||
surf->surf->tiling == ISL_TILING_Y0);