OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

amd/surface: rename metadata functions

Browse Source 
Use more specific verbs to avoid confusion:
   set -> apply
   get -> compute

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21984>
This commit is contained in:
Pierre-Eric Pelloux-Prayer
2023-03-21 10:54:16 +01:00
committed by Marge Bot
parent e272e59e40
commit 4abb911bd2
5 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/amd/common/ac_surface.c
View File

@@ -2637,8 +2637,8 @@ static unsigned eg_tile_split_rev(unsigned eg_tile_split)
#define AMDGPU_TILING_DCC_MAX_COMPRESSED_BLOCK_SIZE_MASK 0x3 #define AMDGPU_TILING_DCC_MAX_COMPRESSED_BLOCK_SIZE_MASK 0x3
/* This should be called before ac_compute_surface. */ /* This should be called before ac_compute_surface. */
void ac_surface_set_bo_metadata(const struct radeon_info *info, struct radeon_surf *surf, void ac_surface_apply_bo_metadata(const struct radeon_info *info, struct radeon_surf *surf,
uint64_t tiling_flags, enum radeon_surf_mode *mode) uint64_t tiling_flags, enum radeon_surf_mode *mode)
{ {
bool scanout; bool scanout;
@@ -2677,8 +2677,8 @@ void ac_surface_set_bo_metadata(const struct radeon_info *info, struct radeon_su
surf->flags &= ~RADEON_SURF_SCANOUT; surf->flags &= ~RADEON_SURF_SCANOUT;
} }
void ac_surface_get_bo_metadata(const struct radeon_info *info, struct radeon_surf *surf, void ac_surface_compute_bo_metadata(const struct radeon_info *info, struct radeon_surf *surf,
uint64_t *tiling_flags) uint64_t *tiling_flags)
{ {
*tiling_flags = 0; *tiling_flags = 0;
@@ -2730,9 +2730,9 @@ static uint32_t ac_get_umd_metadata_word1(const struct radeon_info *info)
} }
/* This should be called after ac_compute_surface. */ /* This should be called after ac_compute_surface. */
bool ac_surface_set_umd_metadata(const struct radeon_info *info, struct radeon_surf *surf, bool ac_surface_apply_umd_metadata(const struct radeon_info *info, struct radeon_surf *surf,
unsigned num_storage_samples, unsigned num_mipmap_levels, unsigned num_storage_samples, unsigned num_mipmap_levels,
unsigned size_metadata, const uint32_t metadata[64]) unsigned size_metadata, const uint32_t metadata[64])
{ {
const uint32_t *desc = &metadata[2]; const uint32_t *desc = &metadata[2];
uint64_t offset; uint64_t offset;
@@ -2822,9 +2822,9 @@ bool ac_surface_set_umd_metadata(const struct radeon_info *info, struct radeon_s
return true; return true;
} }
void ac_surface_get_umd_metadata(const struct radeon_info *info, struct radeon_surf *surf, void ac_surface_compute_umd_metadata(const struct radeon_info *info, struct radeon_surf *surf,
unsigned num_mipmap_levels, uint32_t desc[8], unsigned num_mipmap_levels, uint32_t desc[8],
unsigned *size_metadata, uint32_t metadata[64]) unsigned *size_metadata, uint32_t metadata[64])
{ {
/* Clear the base address and set the relative DCC offset. */ /* Clear the base address and set the relative DCC offset. */
desc[0] = 0; desc[0] = 0;

20
src/amd/common/ac_surface.h
View File

@@ -441,17 +441,17 @@ int ac_compute_surface(struct ac_addrlib *addrlib, const struct radeon_info *inf
struct radeon_surf *surf); struct radeon_surf *surf);
void ac_surface_zero_dcc_fields(struct radeon_surf *surf); void ac_surface_zero_dcc_fields(struct radeon_surf *surf);
void ac_surface_set_bo_metadata(const struct radeon_info *info, struct radeon_surf *surf, void ac_surface_apply_bo_metadata(const struct radeon_info *info, struct radeon_surf *surf,
uint64_t tiling_flags, enum radeon_surf_mode *mode); uint64_t tiling_flags, enum radeon_surf_mode *mode);
void ac_surface_get_bo_metadata(const struct radeon_info *info, struct radeon_surf *surf, void ac_surface_compute_bo_metadata(const struct radeon_info *info, struct radeon_surf *surf,
uint64_t *tiling_flags); uint64_t *tiling_flags);
bool ac_surface_set_umd_metadata(const struct radeon_info *info, struct radeon_surf *surf, bool ac_surface_apply_umd_metadata(const struct radeon_info *info, struct radeon_surf *surf,
unsigned num_storage_samples, unsigned num_mipmap_levels, unsigned num_storage_samples, unsigned num_mipmap_levels,
unsigned size_metadata, const uint32_t metadata[64]); unsigned size_metadata, const uint32_t metadata[64]);
void ac_surface_get_umd_metadata(const struct radeon_info *info, struct radeon_surf *surf, void ac_surface_compute_umd_metadata(const struct radeon_info *info, struct radeon_surf *surf,
unsigned num_mipmap_levels, uint32_t desc[8], unsigned num_mipmap_levels, uint32_t desc[8],
unsigned *size_metadata, uint32_t metadata[64]); unsigned *size_metadata, uint32_t metadata[64]);
bool ac_surface_override_offset_stride(const struct radeon_info *info, struct radeon_surf *surf, bool ac_surface_override_offset_stride(const struct radeon_info *info, struct radeon_surf *surf,
unsigned num_mipmap_levels, uint64_t offset, unsigned pitch); unsigned num_mipmap_levels, uint64_t offset, unsigned pitch);

12
src/amd/vulkan/radv_image.c
View File

@@ -1441,8 +1441,8 @@ radv_query_opaque_metadata(struct radv_device *device, struct radv_image *image,
0, image->planes[0].surface.blk_w, false, false, false, false, 0, image->planes[0].surface.blk_w, false, false, false, false,
desc, NULL); desc, NULL);
ac_surface_get_umd_metadata(&device->physical_device->rad_info, &image->planes[0].surface, ac_surface_compute_umd_metadata(&device->physical_device->rad_info, &image->planes[0].surface,
image->info.levels, desc, &md->size_metadata, md->metadata); image->info.levels, desc, &md->size_metadata, md->metadata);
} }
void void
@@ -1751,10 +1751,10 @@ radv_image_create_layout(struct radv_device *device, struct radv_image_create_in
} }
if (create_info.bo_metadata && !mod_info && if (create_info.bo_metadata && !mod_info &&
!ac_surface_set_umd_metadata(&device->physical_device->rad_info, !ac_surface_apply_umd_metadata(&device->physical_device->rad_info,
&image->planes[plane].surface, image_info.storage_samples, &image->planes[plane].surface, image_info.storage_samples,
image_info.levels, create_info.bo_metadata->size_metadata, image_info.levels, create_info.bo_metadata->size_metadata,
create_info.bo_metadata->metadata)) create_info.bo_metadata->metadata))
return VK_ERROR_INVALID_EXTERNAL_HANDLE; return VK_ERROR_INVALID_EXTERNAL_HANDLE;
if (!create_info.no_metadata_planes && !create_info.bo_metadata && plane_count == 1 && if (!create_info.no_metadata_planes && !create_info.bo_metadata && plane_count == 1 &&

16
src/gallium/drivers/radeonsi/si_texture.c
View File

@@ -553,9 +553,9 @@ static void si_set_tex_bo_metadata(struct si_screen *sscreen, struct si_texture
si_set_mutable_tex_desc_fields(sscreen, tex, &tex->surface.u.legacy.level[0], 0, 0, si_set_mutable_tex_desc_fields(sscreen, tex, &tex->surface.u.legacy.level[0], 0, 0,
tex->surface.blk_w, false, 0, desc); tex->surface.blk_w, false, 0, desc);
ac_surface_get_umd_metadata(&sscreen->info, &tex->surface, ac_surface_compute_umd_metadata(&sscreen->info, &tex->surface,
tex->buffer.b.b.last_level + 1, tex->buffer.b.b.last_level + 1,
desc, &md.size_metadata, md.metadata); desc, &md.size_metadata, md.metadata);
sscreen->ws->buffer_set_metadata(sscreen->ws, tex->buffer.buf, &md, &tex->surface); sscreen->ws->buffer_set_metadata(sscreen->ws, tex->buffer.buf, &md, &tex->surface);
} }
@@ -1628,11 +1628,11 @@ static struct pipe_resource *si_texture_from_winsys_buffer(struct si_screen *ssc
return NULL; return NULL;
} }
if (!ac_surface_set_umd_metadata(&sscreen->info, &tex->surface, if (!ac_surface_apply_umd_metadata(&sscreen->info, &tex->surface,
tex->buffer.b.b.nr_storage_samples, tex->buffer.b.b.nr_storage_samples,
tex->buffer.b.b.last_level + 1, tex->buffer.b.b.last_level + 1,
metadata.size_metadata, metadata.size_metadata,
metadata.metadata)) { metadata.metadata)) {
si_texture_reference(&tex, NULL); si_texture_reference(&tex, NULL);
return NULL; return NULL;
} }

6
src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
View File

@@ -1312,8 +1312,8 @@ static void amdgpu_buffer_get_metadata(struct radeon_winsys *rws,
if (r) if (r)
return; return;
ac_surface_set_bo_metadata(&ws->info, surf, info.metadata.tiling_info, ac_surface_apply_bo_metadata(&ws->info, surf, info.metadata.tiling_info,
&md->mode); &md->mode);
md->size_metadata = info.metadata.size_metadata; md->size_metadata = info.metadata.size_metadata;
memcpy(md->metadata, info.metadata.umd_metadata, sizeof(md->metadata)); memcpy(md->metadata, info.metadata.umd_metadata, sizeof(md->metadata));
@@ -1330,7 +1330,7 @@ static void amdgpu_buffer_set_metadata(struct radeon_winsys *rws,
assert(bo->bo && "must not be called for slab entries"); assert(bo->bo && "must not be called for slab entries");
ac_surface_get_bo_metadata(&ws->info, surf, &metadata.tiling_info); ac_surface_compute_bo_metadata(&ws->info, surf, &metadata.tiling_info);
metadata.size_metadata = md->size_metadata; metadata.size_metadata = md->size_metadata;
memcpy(metadata.umd_metadata, md->metadata, sizeof(md->metadata)); memcpy(metadata.umd_metadata, md->metadata, sizeof(md->metadata));