summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas Stach <dev@lynxeye.de>2017-06-04 21:06:28 +0200
committerAndres Gomez <agomez@igalia.com>2017-06-28 20:15:03 +0300
commite3a2ff07e7e81b837d429d74ad529222229958e4 (patch)
tree5196d2f7eb32e46980352fd982142a363a6ff3cd
parent0889282a7dab9b5d37d816daf0eba95c012edb23 (diff)
etnaviv: don't try RS blit if blit region is unaligned
If the blit region is not aligned to the RS min alignment don't try to execute the blit, but fall back to the software path. Fixes: c9e8b49b ("etnaviv: gallium driver for Vivante GPUs") Cc: mesa-stable@lists.freedesktop.org Signed-off-by: Lucas Stach <dev@lynxeye.de> Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com> (cherry picked from commit 2a6183d416395ca4659e4b6fed9d0918c74cb469)
-rw-r--r--src/gallium/drivers/etnaviv/etnaviv_clear_blit.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c b/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c
index 528b57389d5..96745656e48 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c
@@ -448,7 +448,8 @@ etna_try_rs_blit(struct pipe_context *pctx,
if (width > src_lev->padded_width ||
width > dst_lev->padded_width * msaa_xscale ||
height > src_lev->padded_height ||
- height > dst_lev->padded_height * msaa_yscale)
+ height > dst_lev->padded_height * msaa_yscale ||
+ width & (w_align - 1) || height & (h_align - 1))
goto manual;
if (src->base.nr_samples > 1) {