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

amd/common: Add retile map size helper.

Browse Source 
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9042>
This commit is contained in:
Bas Nieuwenhuizen
2021-02-19 03:58:28 +01:00
parent e59847f67f
commit d78389ea5f
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2990,6 +2990,12 @@ uint64_t ac_surface_get_plane_size(const struct radeon_surf *surf,
} }
} }
uint32_t ac_surface_get_retile_map_size(const struct radeon_surf *surf)
{
return surf->u.gfx9.dcc_retile_num_elements *
(surf->u.gfx9.dcc_retile_use_uint16 ? 2 : 4);
}
void ac_surface_print_info(FILE *out, const struct radeon_info *info, void ac_surface_print_info(FILE *out, const struct radeon_info *info,
const struct radeon_surf *surf) const struct radeon_surf *surf)
{ {

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

@@ -370,6 +370,7 @@ uint64_t ac_surface_get_plane_stride(enum chip_class chip_class,
/* Of the whole miplevel, not an individual layer */ /* Of the whole miplevel, not an individual layer */
uint64_t ac_surface_get_plane_size(const struct radeon_surf *surf, uint64_t ac_surface_get_plane_size(const struct radeon_surf *surf,
unsigned plane); unsigned plane);
uint32_t ac_surface_get_retile_map_size(const struct radeon_surf *surf);
void ac_surface_print_info(FILE *out, const struct radeon_info *info, void ac_surface_print_info(FILE *out, const struct radeon_info *info,
const struct radeon_surf *surf); const struct radeon_surf *surf);

2
src/gallium/drivers/radeonsi/si_compute_blit.c
View File

@@ -648,7 +648,7 @@ void si_retile_dcc(struct si_context *sctx, struct si_texture *tex)
img[0].format = use_uint16 ? PIPE_FORMAT_R16G16B16A16_UINT : PIPE_FORMAT_R32G32B32A32_UINT; img[0].format = use_uint16 ? PIPE_FORMAT_R16G16B16A16_UINT : PIPE_FORMAT_R32G32B32A32_UINT;
img[0].u.buf.offset = 0; img[0].u.buf.offset = 0;
img[0].u.buf.size = num_elements * (use_uint16 ? 2 : 4); img[0].u.buf.size = ac_surface_get_retile_map_size(&tex->surface);
img[1].format = PIPE_FORMAT_R8_UINT; img[1].format = PIPE_FORMAT_R8_UINT;
img[1].u.buf.offset = tex->surface.dcc_offset; img[1].u.buf.offset = tex->surface.dcc_offset;

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

@@ -1077,9 +1077,7 @@ static struct si_texture *si_texture_create_object(struct pipe_screen *screen,
* Use a staging buffer for the upload, because * Use a staging buffer for the upload, because
* the buffer backing the texture is unmappable. * the buffer backing the texture is unmappable.
*/ */
bool use_uint16 = tex->surface.u.gfx9.dcc_retile_use_uint16; uint32_t dcc_retile_map_size = ac_surface_get_retile_map_size(&tex->surface);
unsigned num_elements = tex->surface.u.gfx9.dcc_retile_num_elements;
unsigned dcc_retile_map_size = num_elements * (use_uint16 ? 2 : 4);
tex->dcc_retile_buffer = si_aligned_buffer_create(screen, tex->dcc_retile_buffer = si_aligned_buffer_create(screen,
SI_RESOURCE_FLAG_DRIVER_INTERNAL, PIPE_USAGE_DEFAULT, SI_RESOURCE_FLAG_DRIVER_INTERNAL, PIPE_USAGE_DEFAULT,