From 07caa5932c64076acf8c8e82a1c12d6168984852 Mon Sep 17 00:00:00 2001 From: Topi Pohjolainen Date: Thu, 22 Jun 2017 21:12:40 +0300 Subject: [PATCH] i965/miptree: Prepare intel_miptree_copy() for isl based Reviewed-by: Jason Ekstrand Reviewed-by: Kenneth Graunke Signed-off-by: Topi Pohjolainen --- src/mesa/drivers/dri/i965/intel_blit.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_blit.c b/src/mesa/drivers/dri/i965/intel_blit.c index 4ffff76cc54..68e9c1ad162 100644 --- a/src/mesa/drivers/dri/i965/intel_blit.c +++ b/src/mesa/drivers/dri/i965/intel_blit.c @@ -406,10 +406,22 @@ intel_miptree_copy(struct brw_context *brw, */ assert(src_x % bw == 0); assert(src_y % bh == 0); - assert(src_width % bw == 0 || - src_x + src_width == minify(src_mt->logical_width0, src_level)); - assert(src_height % bh == 0 || - src_y + src_height == minify(src_mt->logical_height0, src_level)); + + if (src_mt->surf.size > 0) { + assert(src_width % bw == 0 || + src_x + src_width == + minify(src_mt->surf.logical_level0_px.width, src_level)); + assert(src_height % bh == 0 || + src_y + src_height == + minify(src_mt->surf.logical_level0_px.height, src_level)); + } else { + assert(src_width % bw == 0 || + src_x + src_width == + minify(src_mt->logical_width0, src_level)); + assert(src_height % bh == 0 || + src_y + src_height == + minify(src_mt->logical_height0, src_level)); + } src_x /= (int)bw; src_y /= (int)bh; -- 2.30.2