freedreno/layout: layout simplifications and pitch from level 0 pitch

[mesa.git] / src / gallium / drivers / freedreno / a6xx / fd6_resource.c

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_resource.c b/src/gallium/drivers/freedreno/a6xx/fd6_resource.c
index c3e349395797ee7733007eb6a09f8a331ed508ed..7adc92d39688c0a444096d4f0f3c92b72231428d 100644 (file)
--- a/src/gallium/drivers/freedreno/a6xx/fd6_resource.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_resource.c
@@ -163,7 +163,10 @@ static int
 fill_ubwc_buffer_sizes(struct fd_resource *rsc)
 {
        struct pipe_resource *prsc = &rsc->base;
-       struct fdl_slice slice = *fd_resource_slice(rsc, 0);
+       struct fdl_explicit_layout explicit = {
+               .offset = rsc->layout.slices[0].offset,
+               .pitch = rsc->layout.pitch0,
+       };
 
        /* limit things to simple single level 2d for now: */
        if ((prsc->depth0 != 1) || (prsc->array_size != 1) || (prsc->last_level != 0))
@@ -178,7 +181,7 @@ fill_ubwc_buffer_sizes(struct fd_resource *rsc)
 
        if (!fdl6_layout(&rsc->layout, prsc->format, fd_resource_nr_samples(prsc),
                        prsc->width0, prsc->height0, prsc->depth0,
-                       prsc->last_level + 1, prsc->array_size, false, &slice))
+                       prsc->last_level + 1, prsc->array_size, false, &explicit))
                return -1;
 
        if (rsc->layout.size > fd_bo_size(rsc->bo))