freedreno/a3xx: fix texture tiling parameters

* Fix 2D/2DArray/3D tiling parameters:
  There is a bottom threshold for width and height.
* Renable tiling for Cubemap, after setting the right parameters.

Reviewed-by: Rob Clark <robdclark@gmail.com>

diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_resource.c b/src/gallium/drivers/freedreno/a3xx/fd3_resource.c
index 5bde52c62be8d76a649a7bd752f4a05a11ef0516..4f8e195f1991462a2a349409d1cc5d375e918425 100644 (file)
--- a/src/gallium/drivers/freedreno/a3xx/fd3_resource.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_resource.c
@@ -41,16 +41,30 @@ setup_slices(struct fd_resource *rsc, uint32_t alignment, enum pipe_format forma
                uint32_t blocks;
 
                if (rsc->tile_mode) {
-                       width = util_next_power_of_two(width);
-                       height = util_next_power_of_two(height);
-                       uint32_t tpitch = width * rsc->cpp;
-                       slice->pitch = (tpitch > 32) ? tpitch : 32;
+                       if (prsc->target != PIPE_TEXTURE_CUBE) {
+                               if (level == 0) {
+                                       width = util_next_power_of_two(width);
+                                       height = util_next_power_of_two(height);
+                               }
+                               width = MAX2(width, 8);
+                               height = MAX2(height, 4);
+                               // Multiplying by 4 is the result of the 4x4 tiling pattern.
+                               slice->pitch = width * 4;
+                               blocks = util_format_get_nblocks(format, width, height);
+                       } else {
+                               uint32_t twidth, theight;
+                               twidth = align(width, 8);
+                               theight = align(height, 4);
+                               // Multiplying by 4 is the result of the 4x4 tiling pattern.
+                               slice->pitch = twidth * 4;
+                               blocks = util_format_get_nblocks(format, twidth, theight);
+                       }
                } else {
                        slice->pitch = width = align(width, pitchalign);
+                       blocks = util_format_get_nblocks(format, slice->pitch, height);
                }
 
                slice->offset = size;
-               blocks = util_format_get_nblocks(format, slice->pitch, height);
                /* 1d array and 2d array textures must all have the same layer size
                 * for each miplevel on a3xx. 3d textures can have different layer
                 * sizes for high levels, but the hw auto-sizer is buggy (or at least
@@ -96,16 +110,13 @@ fd3_setup_slices(struct fd_resource *rsc)
 }
 
 static bool
-ok_format(enum pipe_format pfmt, const struct pipe_resource * tmpl)
+ok_format(enum pipe_format pfmt)
 {
        enum a3xx_color_fmt fmt = fd3_pipe2color(pfmt);
 
        if (fmt == ~0)
                return false;
 
-       if (tmpl->target == PIPE_TEXTURE_CUBE)
-               return false;
-
        switch (pfmt) {
        case PIPE_FORMAT_R8_UINT:
        case PIPE_FORMAT_R8_SINT:
@@ -121,7 +132,7 @@ ok_format(enum pipe_format pfmt, const struct pipe_resource * tmpl)
 unsigned
 fd3_tile_mode(const struct pipe_resource *tmpl)
 {
-       if (ok_format(tmpl->format, tmpl))
+       if (ok_format(tmpl->format))
                return TILE_4X4;
        return LINEAR;
 }