freedreno: use rsc->slice accessor everywhere

[mesa.git] / src / gallium / drivers / freedreno / freedreno_resource.c

diff --git a/src/gallium/drivers/freedreno/freedreno_resource.c b/src/gallium/drivers/freedreno/freedreno_resource.c
index e17a1e85d8759b4c9470f73f85eb62cd6bb7cfa1..fb3d6b65635d87a77137af2d911ceccb83d1bfc9 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_resource.c
+++ b/src/gallium/drivers/freedreno/freedreno_resource.c
@@ -24,9 +24,9 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
-#include "util/u_format.h"
-#include "util/u_format_rgtc.h"
-#include "util/u_format_zs.h"
+#include "util/format/u_format.h"
+#include "util/format/u_format_rgtc.h"
+#include "util/format/u_format_zs.h"
 #include "util/u_inlines.h"
 #include "util/u_transfer.h"
 #include "util/u_string.h"
@@ -419,7 +419,7 @@ static void fd_resource_transfer_flush_region(struct pipe_context *pctx,
        struct fd_resource *rsc = fd_resource(ptrans->resource);
 
        if (ptrans->resource->target == PIPE_BUFFER)
-               util_range_add(&rsc->valid_buffer_range,
+               util_range_add(&rsc->base, &rsc->valid_buffer_range,
                                           ptrans->box.x + box->x,
                                           ptrans->box.x + box->x + box->width);
 }
@@ -489,7 +489,7 @@ fd_resource_transfer_unmap(struct pipe_context *pctx,
                fd_bo_cpu_fini(rsc->bo);
        }
 
-       util_range_add(&rsc->valid_buffer_range,
+       util_range_add(&rsc->base, &rsc->valid_buffer_range,
                                   ptrans->box.x,
                                   ptrans->box.x + ptrans->box.width);
 
@@ -544,12 +544,14 @@ fd_resource_transfer_map(struct pipe_context *pctx,
 
                staging_rsc = fd_alloc_staging(ctx, rsc, level, box);
                if (staging_rsc) {
+                       struct fd_resource_slice *staging_slice =
+                               fd_resource_slice(staging_rsc, 0);
                        // TODO for PIPE_TRANSFER_READ, need to do untiling blit..
                        trans->staging_prsc = &staging_rsc->base;
                        trans->base.stride = util_format_get_nblocksx(format,
-                               staging_rsc->slices[0].pitch) * staging_rsc->cpp;
+                               staging_slice->pitch) * staging_rsc->cpp;
                        trans->base.layer_stride = staging_rsc->layer_first ?
-                               staging_rsc->layer_size : staging_rsc->slices[0].size0;
+                               staging_rsc->layer_size : staging_slice->size0;
                        trans->staging_box = *box;
                        trans->staging_box.x = 0;
                        trans->staging_box.y = 0;
@@ -660,11 +662,13 @@ fd_resource_transfer_map(struct pipe_context *pctx,
                                 */
                                staging_rsc = fd_alloc_staging(ctx, rsc, level, box);
                                if (staging_rsc) {
+                                       struct fd_resource_slice *staging_slice =
+                                               fd_resource_slice(staging_rsc, 0);
                                        trans->staging_prsc = &staging_rsc->base;
                                        trans->base.stride = util_format_get_nblocksx(format,
-                                               staging_rsc->slices[0].pitch) * staging_rsc->cpp;
+                                               staging_slice->pitch) * staging_rsc->cpp;
                                        trans->base.layer_stride = staging_rsc->layer_first ?
-                                               staging_rsc->layer_size : staging_rsc->slices[0].size0;
+                                               staging_rsc->layer_size : staging_slice->size0;
                                        trans->staging_box = *box;
                                        trans->staging_box.x = 0;
                                        trans->staging_box.y = 0;
@@ -747,7 +751,7 @@ fd_resource_modifier(struct fd_resource *rsc)
        return DRM_FORMAT_MOD_INVALID;
 }
 
-static boolean
+static bool
 fd_resource_get_handle(struct pipe_screen *pscreen,
                struct pipe_context *pctx,
                struct pipe_resource *prsc,
@@ -759,7 +763,7 @@ fd_resource_get_handle(struct pipe_screen *pscreen,
        handle->modifier = fd_resource_modifier(rsc);
 
        return fd_screen_bo_get_handle(pscreen, rsc->bo, rsc->scanout,
-                       rsc->slices[0].pitch * rsc->cpp, handle);
+                       fd_resource_slice(rsc, 0)->pitch * rsc->cpp, handle);
 }
 
 static uint32_t
@@ -797,12 +801,12 @@ 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)))
+                                       (level > 1 && fd_resource_slice(rsc, 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);
                else
-                       slice->size0 = rsc->slices[level - 1].size0;
+                       slice->size0 = fd_resource_slice(rsc, level - 1)->size0;
 
                size += slice->size0 * depth * layers_in_level;
 
@@ -918,6 +922,9 @@ fd_resource_create_with_modifiers(struct pipe_screen *pscreen,
                struct renderonly_scanout *scanout;
                struct winsys_handle handle;
 
+               /* apply freedreno alignment requirement */
+               scanout_templat.width0 = align(tmpl->width0, screen->gmem_alignw);
+
                scanout = renderonly_scanout_for_resource(&scanout_templat,
                                                                                                  screen->ro, &handle);
                if (!scanout)
@@ -974,16 +981,16 @@ fd_resource_create_with_modifiers(struct pipe_screen *pscreen,
 
        allow_ubwc &= !(fd_mesa_debug & FD_DBG_NOUBWC);
 
+       pipe_reference_init(&prsc->reference, 1);
+
+       prsc->screen = pscreen;
+
        if (screen->tile_mode &&
                        (tmpl->target != PIPE_BUFFER) &&
                        !linear) {
-               rsc->tile_mode = screen->tile_mode(tmpl);
+               rsc->tile_mode = screen->tile_mode(prsc);
        }
 
-       pipe_reference_init(&prsc->reference, 1);
-
-       prsc->screen = pscreen;
-
        util_range_init(&rsc->valid_buffer_range);
 
        rsc->internal_format = format;
@@ -1087,7 +1094,7 @@ fd_resource_from_handle(struct pipe_screen *pscreen,
 {
        struct fd_screen *screen = fd_screen(pscreen);
        struct fd_resource *rsc = CALLOC_STRUCT(fd_resource);
-       struct fd_resource_slice *slice = &rsc->slices[0];
+       struct fd_resource_slice *slice = fd_resource_slice(rsc, 0);
        struct pipe_resource *prsc = &rsc->base;
        uint32_t pitchalign = fd_screen(pscreen)->gmem_alignw;