From: Marek Olšák <marek.olsak@amd.com>
Date: Tue, 28 Aug 2018 19:49:31 +0000 (-0400)
Subject: r600: fix HTILE for NPOT textures with mipmapping
X-Git-Tag: android-x86-8.1-r1~943
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=da72b6296cfa5c5fa92d840d8a69c55df19d13f5;p=android-x86%2Fexternal-mesa.git

r600: fix HTILE for NPOT textures with mipmapping

Cc: 18.1 18.2 <mesa-stable@lists.freedesktop.org>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
---

diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index 08db6bab04c..d08c6e5637c 100644
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -774,8 +774,8 @@ static void r600_texture_get_htile_size(struct r600_common_screen *rscreen,
 		return;
 	}
 
-	width = align(rtex->resource.b.b.width0, cl_width * 8);
-	height = align(rtex->resource.b.b.height0, cl_height * 8);
+	width = align(rtex->surface.u.legacy.level[0].nblk_x, cl_width * 8);
+	height = align(rtex->surface.u.legacy.level[0].nblk_y, cl_height * 8);
 
 	slice_elements = (width * height) / (8 * 8);
 	slice_bytes = slice_elements * 4;