From ce3f453f0165d0ef29fa482e4ec1f89aa9706b1d Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Sun, 6 Nov 2016 22:27:56 +0100 Subject: radeonsi: fix r600_texture::tc_compatible_htile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit htile_size is now always non-zero if HTILE is allocated. It seems to have caused no issues. Reviewed-by: Nicolai Hähnle --- 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 693330474a3..97673ee2250 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) -- cgit v1.2.3