openharmony/third_party_mesa3d
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_mesa3d synced 2025-03-07 01:27:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

panfrost: Emit surface descriptors with pan_pack()

Browse Source 
Now that we have surface descriptors defined in midgard.xml we can use
pan_pack() to emit them.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9827>
This commit is contained in:
Boris Brezillon 2021-03-25 10:39:17 +01:00
parent 7c08bb5ad0
commit 58747cd2f5
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/panfrost/lib/pan_texture.c
View File

@ -254,21 +254,23 @@ panfrost_block_dim(uint64_t modifier, bool width, unsigned plane)
}
}
static uint64_t
static void
panfrost_get_surface_strides(const struct panfrost_device *dev,
const struct pan_image_layout *layout,
unsigned l)
unsigned l,
int32_t *row_stride, int32_t *surf_stride)
{
const struct panfrost_slice *slice = &layout->slices[l];
if (drm_is_afbc(layout->modifier)) {
/* Pre v7 don't have a row stride field. This field is
* repurposed as a Y offset which we don't use */
return ((uint64_t)slice->afbc.surface_stride << 32) |
(dev->arch < 7 ? 0 : slice->afbc.row_stride);
*row_stride = dev->arch < 7 ? 0 : slice->afbc.row_stride;
*surf_stride = slice->afbc.surface_stride;
} else {
*row_stride = slice->row_stride;
*surf_stride = slice->surface_stride;
}
return ((uint64_t)slice->surface_stride << 32) | slice->row_stride;
}
static mali_ptr
@ -341,7 +343,7 @@ panfrost_surface_iter_next(const struct panfrost_device *dev,
static void
panfrost_emit_texture_payload(const struct panfrost_device *dev,
const struct pan_image_layout *layout,
mali_ptr *payload,
void *payload,
const struct util_format_description *desc,
enum mali_texture_dimension dim,
unsigned first_level, unsigned last_level,
@ -368,23 +370,31 @@ panfrost_emit_texture_payload(const struct panfrost_device *dev,
nr_samples = MAX2(nr_samples, 1);
struct panfrost_surface_iter iter;
unsigned idx = 0;
for (panfrost_surface_iter_begin(&iter, first_layer, last_layer,
first_level, last_level,
first_face, last_face, nr_samples);
!panfrost_surface_iter_end(&iter);
panfrost_surface_iter_next(dev, &iter)) {
payload[idx++] =
mali_ptr pointer =
panfrost_get_surface_pointer(layout, dim, base,
iter.level, iter.layer,
iter.face, iter.sample);
if (!manual_stride)
continue;
payload[idx++] =
panfrost_get_surface_strides(dev, layout, iter.level);
if (!manual_stride) {
pan_pack(payload, SURFACE, cfg) {
cfg.pointer = pointer;
}
payload += MALI_SURFACE_LENGTH;
} else {
pan_pack(payload, SURFACE_WITH_STRIDE, cfg) {
cfg.pointer = pointer;
panfrost_get_surface_strides(dev, layout, iter.level,
&cfg.row_stride,
&cfg.surface_stride);
}
payload += MALI_SURFACE_WITH_STRIDE_LENGTH;
}
}
}