fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 02:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

amd/common: Add total alignment calculation.

Browse source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5194>
This commit is contained in:
Bas Nieuwenhuizen 2020-05-24 14:23:24 +02:00 • committed by Marge Bot
parent f70b577683
commit 63db31fdfc
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/amd/common/ac_surface.c
View file

@ -1871,22 +1871,26 @@ int ac_compute_surface(ADDR_HANDLE addrlib, const struct radeon_info *info,
/* Determine the memory layout of multiple allocations in one buffer. */ /* Determine the memory layout of multiple allocations in one buffer. */
surf->total_size = surf->surf_size; surf->total_size = surf->surf_size;
surf->alignment = surf->surf_alignment;
if (surf->htile_size) { if (surf->htile_size) {
surf->htile_offset = align64(surf->total_size, surf->htile_alignment); surf->htile_offset = align64(surf->total_size, surf->htile_alignment);
surf->total_size = surf->htile_offset + surf->htile_size; surf->total_size = surf->htile_offset + surf->htile_size;
surf->alignment = MAX2(surf->alignment, surf->htile_alignment);
} }
if (surf->fmask_size) { if (surf->fmask_size) {
assert(config->info.samples >= 2); assert(config->info.samples >= 2);
surf->fmask_offset = align64(surf->total_size, surf->fmask_alignment); surf->fmask_offset = align64(surf->total_size, surf->fmask_alignment);
surf->total_size = surf->fmask_offset + surf->fmask_size; surf->total_size = surf->fmask_offset + surf->fmask_size;
surf->alignment = MAX2(surf->alignment, surf->fmask_alignment);
} }
/* Single-sample CMASK is in a separate buffer. */ /* Single-sample CMASK is in a separate buffer. */
if (surf->cmask_size && config->info.samples >= 2) { if (surf->cmask_size && config->info.samples >= 2) {
surf->cmask_offset = align64(surf->total_size, surf->cmask_alignment); surf->cmask_offset = align64(surf->total_size, surf->cmask_alignment);
surf->total_size = surf->cmask_offset + surf->cmask_size; surf->total_size = surf->cmask_offset + surf->cmask_size;
surf->alignment = MAX2(surf->alignment, surf->cmask_alignment);
} }
if (surf->dcc_size && if (surf->dcc_size &&
@ -1918,6 +1922,7 @@ int ac_compute_surface(ADDR_HANDLE addrlib, const struct radeon_info *info,
surf->dcc_offset = align64(surf->total_size, surf->dcc_alignment); surf->dcc_offset = align64(surf->total_size, surf->dcc_alignment);
surf->total_size = surf->dcc_offset + surf->dcc_size; surf->total_size = surf->dcc_offset + surf->dcc_size;
surf->alignment = MAX2(surf->alignment, surf->dcc_alignment);
} }
return 0; return 0;

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

@ -247,6 +247,7 @@ struct radeon_surf {
uint64_t display_dcc_offset; uint64_t display_dcc_offset;
uint64_t dcc_retile_map_offset; uint64_t dcc_retile_map_offset;
uint64_t total_size; uint64_t total_size;
uint32_t alignment;
union { union {
/* Return values for GFX8 and older. /* Return values for GFX8 and older.