From f9d4d0954992e367992fca3c017b5720cb213ded Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Fri, 22 Jan 2016 08:32:00 -0800 Subject: [PATCH] isl: Fix isl_surf_get_image_offset_sa for gen4_3d layout Bug found by unit test test_bdw_3d_r8g8b8a8_unorm_256x256x256_levels09_tiley0. --- src/isl/isl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/isl/isl.c b/src/isl/isl.c index bb3d59576e0..40663ca18af 100644 --- a/src/isl/isl.c +++ b/src/isl/isl.c @@ -1200,10 +1200,9 @@ get_image_offset_sa_gen4_3d(const struct isl_surf *surf, const uint32_t level_d = isl_align_npot(isl_minify(D0, level), image_align_sa.d); const uint32_t max_layers_horiz = MIN(level_d, 1u << level); - const uint32_t max_layers_vert = isl_align_div(level_d, 1u << level); x += level_w * (logical_z_offset_px % max_layers_horiz); - y += level_h * (logical_z_offset_px / max_layers_vert); + y += level_h * (logical_z_offset_px / max_layers_horiz); *x_offset_sa = x; *y_offset_sa = y; -- 2.30.2