From f128bcc7c293013f4b44e4b661638333de0077c2 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 14 Feb 2014 13:00:40 -0800 Subject: i965: Drop mt->levels[].width/height. It often confused people because it was unclear on whether it was the physical or logical, and people needed the other one as well. We can recompute it trivially using the minify() macro, clarifying which value is being used and making getting the other value obvious. v2: Fix a pasteo in intel_blit.c's dst flip. Reviewed-by: Chris Forbes (v1) Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/intel_blit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mesa/drivers/dri/i965/intel_blit.c') diff --git a/src/mesa/drivers/dri/i965/intel_blit.c b/src/mesa/drivers/dri/i965/intel_blit.c index b12ecca366d..df85dc9759e 100644 --- a/src/mesa/drivers/dri/i965/intel_blit.c +++ b/src/mesa/drivers/dri/i965/intel_blit.c @@ -215,10 +215,10 @@ intel_miptree_blit(struct brw_context *brw, intel_miptree_resolve_color(brw, dst_mt); if (src_flip) - src_y = src_mt->level[src_level].height - src_y - height; + src_y = minify(src_mt->physical_height0, src_level) - src_y - height; if (dst_flip) - dst_y = dst_mt->level[dst_level].height - dst_y - height; + dst_y = minify(dst_mt->physical_height0, dst_level) - dst_y - height; int src_pitch = src_mt->region->pitch; if (src_flip != dst_flip) -- cgit v1.2.3