Mesa (master): radeonsi: fix r600_texture::tc_compatible_htile

[Marek Olšák]

Module: Mesa
Branch: master
Commit: ce3f453f0165d0ef29fa482e4ec1f89aa9706b1d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ce3f453f0165d0ef29fa482e4ec1f89aa9706b1d

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sun Nov  6 22:27:56 2016 +0100

radeonsi: fix r600_texture::tc_compatible_htile

htile_size is now always non-zero if HTILE is allocated.

It seems to have caused no issues.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 src/gallium/drivers/radeon/r600_texture.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c
index 6933304..97673ee 100644
--- a/src/gallium/drivers/radeon/r600_texture.c
+++ b/src/gallium/drivers/radeon/r600_texture.c
@@ -1007,9 +1007,9 @@ r600_texture_create_object(struct pipe_screen *screen,
 	rtex->surface = *surface;
 	rtex->size = rtex->surface.surf_size;
 
-	rtex->tc_compatible_htile = rtex->surface.htile_size != 0;
-	assert(!!(rtex->surface.flags & RADEON_SURF_TC_COMPATIBLE_HTILE) ==
-	       rtex->tc_compatible_htile);
+	rtex->tc_compatible_htile = rtex->surface.htile_size != 0 &&
+				    (rtex->surface.flags &
+				     RADEON_SURF_TC_COMPATIBLE_HTILE);
 
 	/* TC-compatible HTILE only supports Z32_FLOAT. */
 	if (rtex->tc_compatible_htile)