KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <sergii.romantsov@globallogic.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Sergii Romantsov 2019-02-28 13:35:54 +02:00 committed by Lionel Landwerlin
parent e757a2481f
commit 72a921e12a
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gallium/drivers/iris/iris_blit.c
View File

@ -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

10
src/mesa/drivers/dri/i965/brw_meta_util.c
View File

@ -220,6 +220,10 @@ brw_meta_mirror_clip_and_scissor(const struct gl_context *ctx,
* 4 * 2 = 8 > 5 in the src.
*/
if (*srcX0 == *srcX1 || *srcY0 == *srcY1
|| *dstX0 == *dstX1 || *dstY0 == *dstY1)
return true;
float scaleX = (float) (*srcX1 - *srcX0) / (*dstX1 - *dstX0);
float scaleY = (float) (*srcY1 - *srcY0) / (*dstY1 - *dstY0);
@ -263,7 +267,11 @@ brw_meta_mirror_clip_and_scissor(const struct gl_context *ctx,
*mirror_y = !*mirror_y;
}
return false;
/* Check for invalid bounds
* Can't blit for 0-dimensions
*/
return *srcX0 == *srcX1 || *srcY0 == *srcY1
|| *dstX0 == *dstX1 || *dstY0 == *dstY1;
}
/**