panfrost: s/panfrost_slice/pan_image_slice_layout/
We are about to move slice states out of the panfrost_slice object, but before we do that, let's rename the existing struct to reflect what this object refers to. Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10033>
This commit is contained in:
parent
ed20e69b0c
commit
b00b6a727c
|
@ -168,7 +168,7 @@ panfrost_mfbd_rt_set_buf(struct pipe_surface *surf,
|
|||
rt->rgb.row_stride = row_stride;
|
||||
rt->rgb.surface_stride = layer_stride;
|
||||
} else if (drm_is_afbc(rsrc->layout.modifier)) {
|
||||
const struct panfrost_slice *slice = &rsrc->layout.slices[level];
|
||||
const struct pan_image_slice_layout *slice = &rsrc->layout.slices[level];
|
||||
|
||||
if (dev->arch >= 7)
|
||||
rt->bifrost_v7.writeback_block_format = MALI_BLOCK_FORMAT_V7_AFBC;
|
||||
|
@ -245,7 +245,7 @@ get_z_internal_format(struct panfrost_batch *batch)
|
|||
static void
|
||||
panfrost_mfbd_zs_crc_ext_set_bufs(struct panfrost_batch *batch,
|
||||
struct MALI_ZS_CRC_EXTENSION *ext,
|
||||
struct panfrost_slice **checksum_slice)
|
||||
struct pan_image_slice_layout **checksum_slice)
|
||||
{
|
||||
struct panfrost_device *dev = pan_device(batch->ctx->base.screen);
|
||||
|
||||
|
@ -257,7 +257,7 @@ panfrost_mfbd_zs_crc_ext_set_bufs(struct panfrost_batch *batch,
|
|||
|
||||
if (rsrc->checksummed) {
|
||||
unsigned level = c_surf->u.tex.level;
|
||||
struct panfrost_slice *slice = &rsrc->layout.slices[level];
|
||||
struct pan_image_slice_layout *slice = &rsrc->layout.slices[level];
|
||||
|
||||
*checksum_slice = slice;
|
||||
|
||||
|
@ -295,7 +295,7 @@ panfrost_mfbd_zs_crc_ext_set_bufs(struct panfrost_batch *batch,
|
|||
ext->zs_msaa_v7 = nr_samples > 1 ? MALI_MSAA_LAYERED : MALI_MSAA_SINGLE;
|
||||
|
||||
if (drm_is_afbc(rsrc->layout.modifier)) {
|
||||
struct panfrost_slice *slice = &rsrc->layout.slices[level];
|
||||
struct pan_image_slice_layout *slice = &rsrc->layout.slices[level];
|
||||
|
||||
panfrost_get_afbc_pointers(rsrc, level, first_layer,
|
||||
&ext->zs_afbc_header,
|
||||
|
@ -371,7 +371,7 @@ panfrost_mfbd_zs_crc_ext_set_bufs(struct panfrost_batch *batch,
|
|||
}
|
||||
|
||||
struct panfrost_resource *stencil = rsrc->separate_stencil;
|
||||
struct panfrost_slice *stencil_slice =
|
||||
struct pan_image_slice_layout *stencil_slice =
|
||||
&stencil->layout.slices[level];
|
||||
|
||||
ext->s_writeback_base =
|
||||
|
@ -387,7 +387,7 @@ panfrost_mfbd_zs_crc_ext_set_bufs(struct panfrost_batch *batch,
|
|||
|
||||
static void
|
||||
panfrost_mfbd_emit_zs_crc_ext(struct panfrost_batch *batch, void *extp,
|
||||
struct panfrost_slice **checksum_slice)
|
||||
struct pan_image_slice_layout **checksum_slice)
|
||||
{
|
||||
pan_pack(extp, ZS_CRC_EXTENSION, ext) {
|
||||
ext.zs_clean_pixel_write_enable = true;
|
||||
|
@ -558,7 +558,7 @@ panfrost_mfbd_fragment(struct panfrost_batch *batch, bool has_draws)
|
|||
rts = fb + MALI_MULTI_TARGET_FRAMEBUFFER_LENGTH;
|
||||
}
|
||||
|
||||
struct panfrost_slice *checksum_slice = NULL;
|
||||
struct pan_image_slice_layout *checksum_slice = NULL;
|
||||
|
||||
if (zs_crc_ext)
|
||||
panfrost_mfbd_emit_zs_crc_ext(batch, zs_crc_ext, &checksum_slice);
|
||||
|
|
|
@ -380,7 +380,7 @@ panfrost_setup_layout(struct panfrost_device *dev,
|
|||
}
|
||||
|
||||
for (unsigned l = 0; l <= res->last_level; ++l) {
|
||||
struct panfrost_slice *slice = &pres->layout.slices[l];
|
||||
struct pan_image_slice_layout *slice = &pres->layout.slices[l];
|
||||
|
||||
unsigned effective_width = width;
|
||||
unsigned effective_height = height;
|
||||
|
@ -646,7 +646,7 @@ panfrost_resource_init_afbc_headers(struct panfrost_resource *pres)
|
|||
|
||||
for (unsigned i = 0; i < pres->base.array_size; ++i) {
|
||||
for (unsigned l = 0; l <= pres->base.last_level; ++l) {
|
||||
struct panfrost_slice *slice = &pres->layout.slices[l];
|
||||
struct pan_image_slice_layout *slice = &pres->layout.slices[l];
|
||||
|
||||
for (unsigned s = 0; s < nr_samples; ++s) {
|
||||
void *ptr = pres->bo->ptr.cpu +
|
||||
|
@ -1343,7 +1343,7 @@ panfrost_get_afbc_pointers(struct panfrost_resource *rsrc,
|
|||
{
|
||||
assert(drm_is_afbc(rsrc->layout.modifier));
|
||||
|
||||
struct panfrost_slice *slice = &rsrc->layout.slices[level];
|
||||
struct pan_image_slice_layout *slice = &rsrc->layout.slices[level];
|
||||
|
||||
if (rsrc->base.target == PIPE_TEXTURE_3D) {
|
||||
*header = rsrc->bo->ptr.gpu + slice->offset +
|
||||
|
|
|
@ -228,7 +228,7 @@ panfrost_sfbd_fragment(struct panfrost_batch *batch, bool has_draws)
|
|||
|
||||
if (rsrc->checksummed) {
|
||||
unsigned level = surf->u.tex.level;
|
||||
struct panfrost_slice *slice = &rsrc->layout.slices[level];
|
||||
struct pan_image_slice_layout *slice = &rsrc->layout.slices[level];
|
||||
|
||||
params.crc_buffer.row_stride = slice->crc.stride;
|
||||
params.crc_buffer.base = bo->ptr.gpu + slice->crc.offset;
|
||||
|
|
|
@ -260,7 +260,7 @@ panfrost_get_surface_strides(const struct panfrost_device *dev,
|
|||
unsigned l,
|
||||
int32_t *row_stride, int32_t *surf_stride)
|
||||
{
|
||||
const struct panfrost_slice *slice = &layout->slices[l];
|
||||
const struct pan_image_slice_layout *slice = &layout->slices[l];
|
||||
|
||||
if (drm_is_afbc(layout->modifier)) {
|
||||
/* Pre v7 don't have a row stride field. This field is
|
||||
|
@ -486,7 +486,7 @@ panfrost_new_texture(const struct panfrost_device *dev,
|
|||
|
||||
unsigned
|
||||
panfrost_compute_checksum_size(
|
||||
struct panfrost_slice *slice,
|
||||
struct pan_image_slice_layout *slice,
|
||||
unsigned width,
|
||||
unsigned height)
|
||||
{
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
#define PAN_MODIFIER_COUNT 4
|
||||
extern uint64_t pan_best_modifiers[PAN_MODIFIER_COUNT];
|
||||
|
||||
struct panfrost_slice {
|
||||
struct pan_image_slice_layout {
|
||||
unsigned offset;
|
||||
unsigned line_stride;
|
||||
unsigned row_stride;
|
||||
|
@ -81,7 +81,7 @@ struct panfrost_slice {
|
|||
struct pan_image_layout {
|
||||
uint64_t modifier;
|
||||
enum mali_texture_dimension dim;
|
||||
struct panfrost_slice slices[MAX_MIP_LEVELS];
|
||||
struct pan_image_slice_layout slices[MAX_MIP_LEVELS];
|
||||
unsigned array_stride;
|
||||
};
|
||||
|
||||
|
@ -99,7 +99,7 @@ struct pan_image {
|
|||
|
||||
unsigned
|
||||
panfrost_compute_checksum_size(
|
||||
struct panfrost_slice *slice,
|
||||
struct pan_image_slice_layout *slice,
|
||||
unsigned width,
|
||||
unsigned height);
|
||||
|
||||
|
|
Loading…
Reference in New Issue