diff options
author | Boris Brezillon <boris.brezillon@collabora.com> | 2020-01-31 13:42:19 +0100 |
---|---|---|
committer | Marge Bot <eric+marge@anholt.net> | 2020-02-03 12:53:47 +0000 |
commit | b550b7ef3b8d12f533b67b1a03159a127a3ff34a (patch) | |
tree | e4a1a5d41ebf5d94a9f1a9f6d5cecbe912eb5067 | |
parent | 2b089e26bfe615cf616926cdddafd8439c835878 (diff) |
panfrost: Fix the damage box clamping logic
When the rendering are is not covering the whole FBO, and the biggest
damage rect is empty, we can have damage.max{x,y} > damage.min{x,y},
which leads to invalid reload boxes.
Fixes: 65ae86b85422 ("panfrost: Add support for KHR_partial_update()")
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3676>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3676>
-rw-r--r-- | src/gallium/drivers/panfrost/pan_job.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gallium/drivers/panfrost/pan_job.c b/src/gallium/drivers/panfrost/pan_job.c index 747e9c95556..8f3acd24e1b 100644 --- a/src/gallium/drivers/panfrost/pan_job.c +++ b/src/gallium/drivers/panfrost/pan_job.c @@ -777,9 +777,11 @@ panfrost_batch_draw_wallpaper(struct panfrost_batch *batch) damage.maxx = MIN2(batch->maxx, rsrc->damage.biggest_rect.x + rsrc->damage.biggest_rect.width); + damage.maxx = MAX2(damage.maxx, damage.minx); damage.maxy = MIN2(batch->maxy, rsrc->damage.biggest_rect.y + rsrc->damage.biggest_rect.height); + damage.maxy = MAX2(damage.maxy, damage.miny); /* One damage rectangle means we can end up with at most 4 reload * regions: |