From 72a921e12ac1828998d2a32966e1dd0123eabfdf Mon Sep 17 00:00:00 2001 From: Sergii Romantsov Date: Thu, 28 Feb 2019 13:35:54 +0200 Subject: i965,iris/blorp: do not blit 0-sizes Seems there is no sense in blitting 0-sized sources or destinations. Additionaly it may cause segfaults for i965. v2: Function call replaced with inline check v3: Added check to avoid devision by zero (L. Landwerlin) v4: Added simillar check for Iris (L. Landwerlin) Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110239 Signed-off-by: Sergii Romantsov Reviewed-by: Kenneth Graunke Reviewed-by: Lionel Landwerlin --- src/gallium/drivers/iris/iris_blit.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/gallium') diff --git a/src/gallium/drivers/iris/iris_blit.c b/src/gallium/drivers/iris/iris_blit.c index 5568be937fb..84eb952d791 100644 --- a/src/gallium/drivers/iris/iris_blit.c +++ b/src/gallium/drivers/iris/iris_blit.c @@ -198,6 +198,10 @@ apply_blit_scissor(const struct pipe_scissor_state *scissor, * clipping 4 * 2 = 8 > 5 in the src. */ + if (*src_x0 == *src_x1 || *src_y0 == *src_y1 + || *dst_x0 == *dst_x1 || *dst_y0 == *dst_y1) + return true; + float scale_x = (float) (*src_x1 - *src_x0) / (*dst_x1 - *dst_x0); float scale_y = (float) (*src_y1 - *src_y0) / (*dst_y1 - *dst_y0); @@ -217,7 +221,11 @@ apply_blit_scissor(const struct pipe_scissor_state *scissor, clip_coordinates(mirror_y, src_y1, dst_y1, dst_y0, clip_dst_y1, clip_dst_y0, scale_y, false); - return false; + /* Check for invalid bounds + * Can't blit for 0-dimensions + */ + return *src_x0 == *src_x1 || *src_y0 == *src_y1 + || *dst_x0 == *dst_x1 || *dst_y0 == *dst_y1; } void -- cgit v1.2.3