From 25eb7c52dc46510a0fbc337e41cacea2bc7eeace Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Thu, 17 Dec 2020 10:46:38 +0100 Subject: [PATCH] panfrost: s/panfrost_slice.size0/panfrost_slice.surface_stride/ This field is encoding the stride between two consecutive surface in a 3D texture. Let's use a name reflecting that. Signed-off-by: Boris Brezillon Reviewed-by: Alyssa Rosenzweig Part-of: --- src/gallium/drivers/panfrost/pan_mfbd.c | 6 +++--- src/gallium/drivers/panfrost/pan_resource.c | 2 +- src/panfrost/lib/pan_texture.c | 4 ++-- src/panfrost/lib/pan_texture.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_mfbd.c b/src/gallium/drivers/panfrost/pan_mfbd.c index 7fe9b96..5931025 100644 --- a/src/gallium/drivers/panfrost/pan_mfbd.c +++ b/src/gallium/drivers/panfrost/pan_mfbd.c @@ -139,7 +139,7 @@ panfrost_mfbd_rt_set_buf(struct pipe_surface *surf, /* Only set layer_stride for layered MSAA rendering */ unsigned nr_samples = surf->texture->nr_samples; - unsigned layer_stride = (nr_samples > 1) ? rsrc->slices[level].size0 : 0; + unsigned layer_stride = (nr_samples > 1) ? rsrc->slices[level].surface_stride : 0; mali_ptr base = panfrost_get_texture_address(rsrc, level, first_layer, 0); if (layer_stride) @@ -310,7 +310,7 @@ panfrost_mfbd_zs_crc_ext_set_bufs(struct panfrost_batch *batch, int row_stride = rsrc->slices[level].row_stride; - unsigned layer_stride = (nr_samples > 1) ? rsrc->slices[level].size0 : 0; + unsigned layer_stride = (nr_samples > 1) ? rsrc->slices[level].surface_stride : 0; ext->zs_writeback_base = base; ext->zs_writeback_row_stride = row_stride; @@ -359,7 +359,7 @@ panfrost_mfbd_zs_crc_ext_set_bufs(struct panfrost_batch *batch, struct panfrost_resource *stencil = rsrc->separate_stencil; struct panfrost_slice stencil_slice = stencil->slices[level]; - unsigned stencil_layer_stride = (nr_samples > 1) ? stencil_slice.size0 : 0; + unsigned stencil_layer_stride = (nr_samples > 1) ? stencil_slice.surface_stride : 0; ext->s_writeback_base = panfrost_get_texture_address(stencil, level, first_layer, 0); ext->s_writeback_row_stride = stencil_slice.row_stride; diff --git a/src/gallium/drivers/panfrost/pan_resource.c b/src/gallium/drivers/panfrost/pan_resource.c index 5e4a720..2d7852a 100644 --- a/src/gallium/drivers/panfrost/pan_resource.c +++ b/src/gallium/drivers/panfrost/pan_resource.c @@ -401,7 +401,7 @@ panfrost_setup_slices(struct panfrost_device *dev, unsigned slice_one_size = slice->line_stride * effective_height; unsigned slice_full_size = slice_one_size * effective_depth; - slice->size0 = slice_one_size; + slice->surface_stride = slice_one_size; /* Report 2D size for 3D texturing */ diff --git a/src/panfrost/lib/pan_texture.c b/src/panfrost/lib/pan_texture.c index 727af75..be487f2 100644 --- a/src/panfrost/lib/pan_texture.c +++ b/src/panfrost/lib/pan_texture.c @@ -513,7 +513,7 @@ panfrost_compute_checksum_size( unsigned panfrost_get_layer_stride(struct panfrost_slice *slices, bool is_3d, unsigned cube_stride, unsigned level) { - return is_3d ? slices[level].size0 : cube_stride; + return is_3d ? slices[level].surface_stride : cube_stride; } /* Computes the offset into a texture at a particular level/face. Add to @@ -523,5 +523,5 @@ unsigned panfrost_texture_offset(struct panfrost_slice *slices, bool is_3d, unsigned cube_stride, unsigned level, unsigned face, unsigned sample) { unsigned layer_stride = panfrost_get_layer_stride(slices, is_3d, cube_stride, level); - return slices[level].offset + (face * layer_stride) + (sample * slices[level].size0); + return slices[level].offset + (face * layer_stride) + (sample * slices[level].surface_stride); } diff --git a/src/panfrost/lib/pan_texture.h b/src/panfrost/lib/pan_texture.h index 6f384ac..9507e23 100644 --- a/src/panfrost/lib/pan_texture.h +++ b/src/panfrost/lib/pan_texture.h @@ -42,7 +42,7 @@ struct panfrost_slice { unsigned offset; unsigned line_stride; unsigned row_stride; - unsigned size0; + unsigned surface_stride; /* If there is a header preceding each slice, how big is * that header? Used for AFBC */ -- 2.7.4