fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-24 06:00:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

ac/surface,radv: Avoid pitch weirdness if image not used for rendertarget.

Browse source 
Literally no point to it.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21869>
This commit is contained in:
Bas Nieuwenhuizen 2023-03-13 02:09:17 +01:00 • committed by Marge Bot
parent 102445d2c3
commit 71a50bdaad
4 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1132,7 +1132,9 @@ static int gfx6_compute_surface(ADDR_HANDLE addrlib, const struct radeon_info *i
!compressed &&
((config->info.array_size == 1 && config->info.depth == 1) || config->info.levels == 1);
AddrSurfInfoIn.flags.noStencil = (surf->flags & RADEON_SURF_SBUFFER) == 0;
AddrSurfInfoIn.flags.noStencil =
!(surf->flags & RADEON_SURF_SBUFFER) || (surf->flags & RADEON_SURF_NO_RENDER_TARGET);
AddrSurfInfoIn.flags.compressZ = !!(surf->flags & RADEON_SURF_Z_OR_SBUFFER);
/* On GFX7-GFX8, the DB uses the same pitch and tile mode (except tilesplit)

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

@ -624,8 +624,14 @@ radv_get_surface_flags(struct radv_device *device, struct radv_image *image, uns
if (is_depth) {
flags |= RADEON_SURF_ZBUFFER;
if (is_depth && is_stencil &&
!(pCreateInfo->usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) &&
device->physical_device->rad_info.gfx_level <= GFX8)
flags |= RADEON_SURF_NO_RENDER_TARGET;
if (radv_use_htile_for_image(device, image) &&
!(device->instance->debug_flags & RADV_DEBUG_NO_HIZ)) {
!(device->instance->debug_flags & RADV_DEBUG_NO_HIZ) &&
!(flags & RADEON_SURF_NO_RENDER_TARGET)) {
if (radv_use_tc_compat_htile_for_image(device, pCreateInfo, image_format))
flags |= RADEON_SURF_TC_COMPATIBLE_HTILE;
} else {

4
src/amd/vulkan/radv_meta_copy.c
View file

@ -81,6 +81,10 @@ radv_image_is_renderable(struct radv_device *device, struct radv_image *image)
vk_format_get_blocksizebits(image->vk.format) == 128 &&
vk_format_is_compressed(image->vk.format))
return false;
if (image->planes[0].surface.flags & RADEON_SURF_NO_RENDER_TARGET)
return false;
return true;
}

3
src/amd/vulkan/radv_meta_resolve.c
View file

@ -304,7 +304,8 @@ radv_pick_resolve_method_images(struct radv_device *device, struct radv_image *s
else if (src_image->info.array_size > 1 || dest_image->info.array_size > 1)
*method = RESOLVE_COMPUTE;
} else {
if (src_image->info.array_size > 1 || dest_image->info.array_size > 1)
if (src_image->info.array_size > 1 || dest_image->info.array_size > 1 ||
(dest_image->planes[0].surface.flags & RADEON_SURF_NO_RENDER_TARGET))
*method = RESOLVE_COMPUTE;
else
*method = RESOLVE_FRAGMENT;