diff options
| author | Eric Anholt <eric@anholt.net> | 2013-12-23 15:30:03 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-01-09 15:23:00 +0800 |
| commit | bdc5241af4aa9afbd66f6c96ee6d20e09f77ea89 (patch) | |
| tree | 6f49bf2be8113e126b700b60da0a6f3023ffefd9 /src/mesa/drivers/dri/i965/intel_blit.c | |
| parent | e8ff08edd823ddf6b0e07ef84d2ba8afc3abbc34 (diff) | |
| download | external_mesa3d-bdc5241af4aa9afbd66f6c96ee6d20e09f77ea89.zip external_mesa3d-bdc5241af4aa9afbd66f6c96ee6d20e09f77ea89.tar.gz external_mesa3d-bdc5241af4aa9afbd66f6c96ee6d20e09f77ea89.tar.bz2 | |
i965: Don't call the blitter on addresses it can't handle.
Noticed by tex3d-maxsize on my next commit to check that our addresses
don't overflow.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_blit.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_blit.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_blit.c b/src/mesa/drivers/dri/i965/intel_blit.c index 7bc289f..13cc777 100644 --- a/src/mesa/drivers/dri/i965/intel_blit.c +++ b/src/mesa/drivers/dri/i965/intel_blit.c @@ -229,12 +229,32 @@ intel_miptree_blit(struct brw_context *brw, src_x += src_image_x; src_y += src_image_y; + /* The blitter interprets the 16-bit src x/y as a signed 16-bit value, + * where negative values are invalid. The values we're working with are + * unsigned, so make sure we don't overflow. + */ + if (src_x >= 32768 || src_y >= 32768) { + perf_debug("Falling back due to >=32k src offset (%d, %d)\n", + src_x, src_y); + return false; + } + uint32_t dst_image_x, dst_image_y; intel_miptree_get_image_offset(dst_mt, dst_level, dst_slice, &dst_image_x, &dst_image_y); dst_x += dst_image_x; dst_y += dst_image_y; + /* The blitter interprets the 16-bit destination x/y as a signed 16-bit + * value. The values we're working with are unsigned, so make sure we + * don't overflow. + */ + if (dst_x >= 32768 || dst_y >= 32768) { + perf_debug("Falling back due to >=32k dst offset (%d, %d)\n", + dst_x, dst_y); + return false; + } + if (!intelEmitCopyBlit(brw, src_mt->cpp, src_pitch, |