freedreno: constify fd_vsc_pipe

[mesa.git] / src / gallium / drivers / freedreno / a3xx / fd3_resource.c

diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_resource.c b/src/gallium/drivers/freedreno/a3xx/fd3_resource.c
index 546f6caf87d9c4b1d5342f6ecb20f2136556b9f9..6089ca01e40ede9afd2b637e588708feda2c44c6 100644 (file)
--- a/src/gallium/drivers/freedreno/a3xx/fd3_resource.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_resource.c
@@ -30,28 +30,41 @@ setup_slices(struct fd_resource *rsc, uint32_t alignment, enum pipe_format forma
 {
        struct pipe_resource *prsc = &rsc->base;
        struct fd_screen *screen = fd_screen(prsc->screen);
-       enum util_format_layout layout = util_format_description(format)->layout;
        uint32_t pitchalign = screen->gmem_alignw;
        uint32_t level, size = 0;
        uint32_t width = prsc->width0;
        uint32_t height = prsc->height0;
        uint32_t depth = prsc->depth0;
-       /* in layer_first layout, the level (slice) contains just one
-        * layer (since in fact the layer contains the slices)
-        */
-       uint32_t layers_in_level = rsc->layer_first ? 1 : prsc->array_size;
 
        for (level = 0; level <= prsc->last_level; level++) {
-               struct fd_resource_slice *slice = fd_resource_slice(rsc, level);
+               struct fdl_slice *slice = fd_resource_slice(rsc, level);
                uint32_t blocks;
 
-               if (layout == UTIL_FORMAT_LAYOUT_ASTC)
-                       slice->pitch = width =
-                               util_align_npot(width, pitchalign * util_format_get_blockwidth(format));
-               else
+               if (rsc->layout.tile_mode) {
+                       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, width, 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
@@ -60,14 +73,14 @@ setup_slices(struct fd_resource *rsc, uint32_t alignment, enum pipe_format forma
                 */
                if (prsc->target == PIPE_TEXTURE_3D && (
                                        level == 1 ||
-                                       (level > 1 && rsc->slices[level - 1].size0 > 0xf000)))
-                       slice->size0 = align(blocks * rsc->cpp, alignment);
-               else if (level == 0 || rsc->layer_first || alignment == 1)
-                       slice->size0 = align(blocks * rsc->cpp, alignment);
+                                       (level > 1 && fd_resource_slice(rsc, level - 1)->size0 > 0xf000)))
+                       slice->size0 = align(blocks * rsc->layout.cpp, alignment);
+               else if (level == 0 || alignment == 1)
+                       slice->size0 = align(blocks * rsc->layout.cpp, alignment);
                else
-                       slice->size0 = rsc->slices[level - 1].size0;
+                       slice->size0 = fd_resource_slice(rsc, level - 1)->size0;
 
-               size += slice->size0 * depth * layers_in_level;
+               size += slice->size0 * depth * prsc->array_size;
 
                width = u_minify(width, 1);
                height = u_minify(height, 1);
@@ -104,6 +117,15 @@ ok_format(enum pipe_format pfmt)
        if (fmt == ~0)
                return false;
 
+       switch (pfmt) {
+       case PIPE_FORMAT_R8_UINT:
+       case PIPE_FORMAT_R8_SINT:
+       case PIPE_FORMAT_Z32_FLOAT:
+               return false;
+       default:
+               break;
+       }
+
        return true;
 }