freedreno/a5xx: Move resource layout to fdl.
[mesa.git] / src / gallium / drivers / freedreno / a5xx / fd5_resource.c
index e879b3609633ff14fa1b1b4e3465348f0e7d6893..0a156d377b42175207d3ec63093a9608354015b7 100644 (file)
 
 #include "fd5_resource.h"
 
-/* indexed by cpp: */
-static const struct {
-       unsigned pitchalign;
-       unsigned heightalign;
-} tile_alignment[] = {
-       [1]  = { 128, 32 },
-       [2]  = { 128, 16 },
-       [3]  = { 128, 16 },
-       [4]  = {  64, 16 },
-       [8]  = {  64, 16 },
-       [12] = {  64, 16 },
-       [16] = {  64, 16 },
-};
-
-/* NOTE: good way to test this is:  (for example)
- *  piglit/bin/texelFetch fs sampler2D 100x100x1-100x300x1
- */
-static uint32_t
-setup_slices(struct fd_resource *rsc, uint32_t alignment, enum pipe_format format)
-{
-       struct pipe_resource *prsc = &rsc->base;
-       enum util_format_layout layout = util_format_description(format)->layout;
-       uint32_t pitchalign;
-       uint32_t heightalign;
-       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->layout.layer_first ? 1 : prsc->array_size;
-
-       heightalign = tile_alignment[rsc->layout.cpp].heightalign;
-
-       for (level = 0; level <= prsc->last_level; level++) {
-               struct fdl_slice *slice = fd_resource_slice(rsc, level);
-               uint32_t aligned_height = height;
-               uint32_t blocks;
-
-               if (fd_resource_tile_mode(prsc, level)) {
-                       pitchalign = tile_alignment[rsc->layout.cpp].pitchalign;
-                       aligned_height = align(aligned_height, heightalign);
-               } else {
-                       pitchalign = 64;
-
-                       /* The blits used for mem<->gmem work at a granularity of
-                        * 32x32, which can cause faults due to over-fetch on the
-                        * last level.  The simple solution is to over-allocate a
-                        * bit the last level to ensure any over-fetch is harmless.
-                        * The pitch is already sufficiently aligned, but height
-                        * may not be:
-                        */
-                       if ((level == prsc->last_level) && (prsc->target != PIPE_BUFFER))
-                               aligned_height = align(aligned_height, 32);
-               }
-
-               unsigned pitch_pixels;
-               if (layout == UTIL_FORMAT_LAYOUT_ASTC)
-                       pitch_pixels =
-                               util_align_npot(width, pitchalign * util_format_get_blockwidth(format));
-               else
-                       pitch_pixels = align(width, pitchalign);
-
-               slice->offset = size;
-               blocks = util_format_get_nblocks(format, pitch_pixels, aligned_height);
-               slice->pitch = util_format_get_nblocksx(format, pitch_pixels) *
-                       rsc->layout.cpp;
-
-               /* 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
-                * different than what this code does), so as soon as the layer size
-                * range gets into range, we stop reducing it.
-                */
-               if (prsc->target == PIPE_TEXTURE_3D && (
-                                       level == 1 ||
-                                       (level > 1 && fd_resource_slice(rsc, level - 1)->size0 > 0xf000)))
-                       slice->size0 = align(blocks * rsc->layout.cpp, alignment);
-               else if (level == 0 || rsc->layout.layer_first || alignment == 1)
-                       slice->size0 = align(blocks * rsc->layout.cpp, alignment);
-               else
-                       slice->size0 = fd_resource_slice(rsc, level - 1)->size0;
-
-               size += slice->size0 * depth * layers_in_level;
-
-               width = u_minify(width, 1);
-               height = u_minify(height, 1);
-               depth = u_minify(depth, 1);
-       }
-
-       return size;
-}
-
 static void
 setup_lrz(struct fd_resource *rsc)
 {
@@ -151,21 +57,15 @@ setup_lrz(struct fd_resource *rsc)
 uint32_t
 fd5_setup_slices(struct fd_resource *rsc)
 {
-       uint32_t alignment;
+       struct pipe_resource *prsc = &rsc->base;
 
        if ((fd_mesa_debug & FD_DBG_LRZ) && has_depth(rsc->base.format))
                setup_lrz(rsc);
 
-       switch (rsc->base.target) {
-       case PIPE_TEXTURE_3D:
-               rsc->layout.layer_first = false;
-               alignment = 4096;
-               break;
-       default:
-               rsc->layout.layer_first = true;
-               alignment = 1;
-               break;
-       }
+       fdl5_layout(&rsc->layout, prsc->format, fd_resource_nr_samples(prsc),
+                       prsc->width0, prsc->height0, prsc->depth0,
+                       prsc->last_level + 1, prsc->array_size,
+                       prsc->target == PIPE_TEXTURE_3D);
 
-       return setup_slices(rsc, alignment, rsc->base.format);
+       return rsc->layout.size;
 }