blorp: Fix alignment test for HIZ_CCS_WT fast-clears

Remove the extra logical ORs in the ternary operation.

Fixes: 5425fcf2cb ("intel/blorp: Satisfy HIZ_CCS fast-clear alignments")
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6650>
(cherry picked from commit 1eff389bd3)
This commit is contained in:
Nanley Chery 2020-09-08 07:33:59 -07:00 committed by Eric Engestrom
parent 1cd618104a
commit 8e6f14e611
2 changed files with 3 additions and 3 deletions

View file

@ -796,7 +796,7 @@
"description": "blorp: Fix alignment test for HIZ_CCS_WT fast-clears",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "5425fcf2cb39dc9df56593d4460b56688506c0cc"
},

View file

@ -832,8 +832,8 @@ blorp_can_hiz_clear_depth(const struct gen_device_info *devinfo,
const uint32_t haligned_x1 = ALIGN(x1, surf->image_alignment_el.w);
const uint32_t valigned_y1 = ALIGN(y1, surf->image_alignment_el.h);
const bool unaligned = (slice_x0 + x0) % 16 || (slice_y0 + y0) % 8 ||
max_x1_y1 ? haligned_x1 % 16 || valigned_y1 % 8 :
x1 % 16 || y1 % 8;
(max_x1_y1 ? haligned_x1 % 16 || valigned_y1 % 8 :
x1 % 16 || y1 % 8);
const bool alignment_used = surf->levels > 1 ||
surf->logical_level0_px.depth > 1 ||
surf->logical_level0_px.array_len > 1;