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

amd: unify code for overriding offset and stride for imported buffers

Browse source 
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4863>
This commit is contained in:
Marek Olšák 2020-05-04 07:43:44 -04:00 • committed by Marge Bot
parent c164ea86e1
commit 441eaef6a9
4 changed files with 47 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2189,3 +2189,29 @@ void ac_surface_get_umd_metadata(const struct radeon_info *info,
*size_metadata += num_mipmap_levels * 4;
}
}
void ac_surface_override_offset_stride(const struct radeon_info *info,
struct radeon_surf *surf,
unsigned num_mipmap_levels,
uint64_t offset, unsigned pitch)
{
if (info->chip_class >= GFX9) {
if (pitch) {
surf->u.gfx9.surf_pitch = pitch;
if (num_mipmap_levels == 1)
surf->u.gfx9.surf.epitch = pitch - 1;
surf->u.gfx9.surf_slice_size =
(uint64_t)pitch * surf->u.gfx9.surf_height * surf->bpe;
}
surf->u.gfx9.surf_offset = offset;
} else {
surf->u.legacy.level[0].nblk_x = pitch;
surf->u.legacy.level[0].slice_size_dw =
((uint64_t)pitch * surf->u.legacy.level[0].nblk_y * surf->bpe) / 4;
if (offset) {
for (unsigned i = 0; i < ARRAY_SIZE(surf->u.legacy.level); ++i)
surf->u.legacy.level[i].offset += offset;
}
}
}

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

@ -309,6 +309,11 @@ void ac_surface_get_umd_metadata(const struct radeon_info *info,
uint32_t desc[8],
unsigned *size_metadata, uint32_t metadata[64]);
void ac_surface_override_offset_stride(const struct radeon_info *info,
struct radeon_surf *surf,
unsigned num_mipmap_levels,
uint64_t offset, unsigned pitch);
#ifdef __cplusplus
}
#endif

24
src/amd/vulkan/radv_image.c
View file

@ -1178,27 +1178,9 @@ radv_image_override_offset_stride(struct radv_device *device,
struct radv_image *image,
uint64_t offset, uint32_t stride)
{
struct radeon_surf *surface = &image->planes[0].surface;
unsigned bpe = vk_format_get_blocksizebits(image->vk_format) / 8;
if (device->physical_device->rad_info.chip_class >= GFX9) {
if (stride) {
surface->u.gfx9.surf_pitch = stride;
surface->u.gfx9.surf_slice_size =
(uint64_t)stride * surface->u.gfx9.surf_height * bpe;
}
surface->u.gfx9.surf_offset = offset;
} else {
surface->u.legacy.level[0].nblk_x = stride;
surface->u.legacy.level[0].slice_size_dw =
((uint64_t)stride * surface->u.legacy.level[0].nblk_y * bpe) / 4;
if (offset) {
for (unsigned i = 0; i < ARRAY_SIZE(surface->u.legacy.level); ++i)
surface->u.legacy.level[i].offset += offset;
}
}
ac_surface_override_offset_stride(&device->physical_device->rad_info,
&image->planes[0].surface,
image->info.levels, offset, stride);
}
static void

43
src/gallium/drivers/radeonsi/si_texture.c
View file

@ -209,8 +209,8 @@ static unsigned si_texture_get_offset(struct si_screen *sscreen, struct si_textu
static int si_init_surface(struct si_screen *sscreen, struct radeon_surf *surface,
const struct pipe_resource *ptex, enum radeon_surf_mode array_mode,
unsigned pitch_in_bytes_override, bool is_imported, bool is_scanout,
bool is_flushed_depth, bool tc_compatible_htile)
bool is_imported, bool is_scanout, bool is_flushed_depth,
bool tc_compatible_htile)
{
const struct util_format_description *desc = util_format_description(ptex->format);
bool is_depth, is_stencil;
@ -311,22 +311,6 @@ static int si_init_surface(struct si_screen *sscreen, struct radeon_surf *surfac
return r;
}
unsigned pitch = pitch_in_bytes_override / bpe;
if (sscreen->info.chip_class >= GFX9) {
if (pitch) {
surface->u.gfx9.surf_pitch = pitch;
if (ptex->last_level == 0)
surface->u.gfx9.surf.epitch = pitch - 1;
surface->u.gfx9.surf_slice_size = (uint64_t)pitch * surface->u.gfx9.surf_height * bpe;
}
} else {
if (pitch) {
surface->u.legacy.level[0].nblk_x = pitch;
surface->u.legacy.level[0].slice_size_dw =
((uint64_t)pitch * surface->u.legacy.level[0].nblk_y * bpe) / 4;
}
}
return 0;
}
@ -974,7 +958,8 @@ static struct si_texture *si_texture_create_object(struct pipe_screen *screen,
const struct pipe_resource *base,
const struct radeon_surf *surface,
const struct si_texture *plane0,
struct pb_buffer *imported_buf, uint64_t offset,
struct pb_buffer *imported_buf,
uint64_t offset, unsigned pitch_in_bytes,
uint64_t alloc_size, unsigned alignment)
{
struct si_texture *tex;
@ -1020,12 +1005,9 @@ static struct si_texture *si_texture_create_object(struct pipe_screen *screen,
*/
tex->ps_draw_ratio = 0;
if (sscreen->info.chip_class >= GFX9) {
tex->surface.u.gfx9.surf_offset = offset;
} else {
for (unsigned i = 0; i < ARRAY_SIZE(surface->u.legacy.level); ++i)
tex->surface.u.legacy.level[i].offset += offset;
}
ac_surface_override_offset_stride(&sscreen->info, &tex->surface,
tex->buffer.b.b.last_level + 1,
offset, pitch_in_bytes / tex->surface.bpe);
if (tex->is_depth) {
if (sscreen->info.chip_class >= GFX9) {
@ -1340,7 +1322,7 @@ struct pipe_resource *si_texture_create(struct pipe_screen *screen,
if (num_planes > 1)
plane_templ[i].bind |= PIPE_BIND_SHARED;
if (si_init_surface(sscreen, &surface[i], &plane_templ[i], tile_mode, 0, false,
if (si_init_surface(sscreen, &surface[i], &plane_templ[i], tile_mode, false,
plane_templ[i].bind & PIPE_BIND_SCANOUT, is_flushed_depth,
tc_compatible_htile))
return NULL;
@ -1355,7 +1337,7 @@ struct pipe_resource *si_texture_create(struct pipe_screen *screen,
for (unsigned i = 0; i < num_planes; i++) {
struct si_texture *tex =
si_texture_create_object(screen, &plane_templ[i], &surface[i], plane0, NULL,
plane_offset[i], total_size, max_alignment);
plane_offset[i], 0, total_size, max_alignment);
if (!tex) {
si_texture_reference(&plane0, NULL);
return NULL;
@ -1378,7 +1360,7 @@ struct pipe_resource *si_texture_create(struct pipe_screen *screen,
static struct pipe_resource *si_texture_from_winsys_buffer(struct si_screen *sscreen,
const struct pipe_resource *templ,
struct pb_buffer *buf, unsigned stride,
unsigned offset, unsigned usage,
uint64_t offset, unsigned usage,
bool dedicated)
{
struct radeon_surf surface = {};
@ -1418,12 +1400,13 @@ static struct pipe_resource *si_texture_from_winsys_buffer(struct si_screen *ssc
metadata.mode = RADEON_SURF_MODE_LINEAR_ALIGNED;
}
r = si_init_surface(sscreen, &surface, templ, metadata.mode, stride, true,
r = si_init_surface(sscreen, &surface, templ, metadata.mode, true,
surface.flags & RADEON_SURF_SCANOUT, false, false);
if (r)
return NULL;
tex = si_texture_create_object(&sscreen->b, templ, &surface, NULL, buf, offset, 0, 0);
tex = si_texture_create_object(&sscreen->b, templ, &surface, NULL, buf,
offset, stride, 0, 0);
if (!tex)
return NULL;