diff --git a/.pick_status.json b/.pick_status.json index c9e1fdb0c14..917261721c3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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 diff --git a/src/intel/blorp/blorp_clear.c b/src/intel/blorp/blorp_clear.c index 845ebfb42e1..d16e5a73f6c 100644 --- a/src/intel/blorp/blorp_clear.c +++ b/src/intel/blorp/blorp_clear.c @@ -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);