From 01d6a2ad1635c7db1633fdf695950818731a7648 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sat, 15 Mar 2014 08:16:42 +1300 Subject: [PATCH] i965: Account for MinLayer/MinLevel in blorp CTSI path Signed-off-by: Chris Forbes Reviewed-by: Kenneth Graunke Acked-by: Eric Anholt --- src/mesa/drivers/dri/i965/brw_blorp_blit.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp index 9e80935..300ff5c 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp +++ b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp @@ -402,9 +402,13 @@ brw_blorp_copytexsubimage(struct brw_context *brw, mirror_y = true; } + /* Account for face selection and texture view MinLayer */ + int dst_slice = slice + dst_image->TexObject->MinLayer + dst_image->Face; + int dst_level = dst_image->Level + dst_image->TexObject->MinLevel; + brw_blorp_blit_miptrees(brw, src_mt, src_irb->mt_level, src_irb->mt_layer, - dst_mt, dst_image->Level, dst_image->Face + slice, + dst_mt, dst_level, dst_slice, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, GL_NEAREST, false, mirror_y); @@ -427,8 +431,7 @@ brw_blorp_copytexsubimage(struct brw_context *brw, if (src_mt != dst_mt) { brw_blorp_blit_miptrees(brw, src_mt, src_irb->mt_level, src_irb->mt_layer, - dst_mt, dst_image->Level, - dst_image->Face + slice, + dst_mt, dst_level, dst_slice, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, GL_NEAREST, false, mirror_y); -- 2.7.4