From: Marek Olšák <marek.ol...@amd.com>

---
 src/gallium/drivers/radeon/r600_texture.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeon/r600_texture.c 
b/src/gallium/drivers/radeon/r600_texture.c
index cba4e7d..971e40a 100644
--- a/src/gallium/drivers/radeon/r600_texture.c
+++ b/src/gallium/drivers/radeon/r600_texture.c
@@ -1177,21 +1177,24 @@ r600_choose_tiling(struct r600_common_screen *rscreen,
                if (rscreen->chip_class >= SI &&
                    (templ->bind & PIPE_BIND_CURSOR))
                        return RADEON_SURF_MODE_LINEAR_ALIGNED;
 
                if (templ->bind & PIPE_BIND_LINEAR)
                        return RADEON_SURF_MODE_LINEAR_ALIGNED;
 
                /* Textures with a very small height are recommended to be 
linear. */
                if (templ->target == PIPE_TEXTURE_1D ||
                    templ->target == PIPE_TEXTURE_1D_ARRAY ||
-                   templ->height0 <= 4)
+                   templ->height0 == 1 ||
+                   /* Assume that the linear alignment has to be 64 texels. */
+                   (templ->width0 > 32 &&
+                    templ->height0 <= 4))
                        return RADEON_SURF_MODE_LINEAR_ALIGNED;
 
                /* Textures likely to be mapped often. */
                if (templ->usage == PIPE_USAGE_STAGING ||
                    templ->usage == PIPE_USAGE_STREAM)
                        return RADEON_SURF_MODE_LINEAR_ALIGNED;
        }
 
        /* Make small textures 1D tiled. */
        if (templ->width0 <= 16 || templ->height0 <= 16 ||
-- 
2.7.4

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to