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

radv: move more surf_index logic to use_tile_swizzle

Browse source 
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38093>
This commit is contained in:
Marek Olšák 2025-10-15 04:19:34 -04:00 • committed by Marge Bot
parent ca6ba34669
commit 2bbc7d1db6
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1211,7 +1211,9 @@ static bool use_tile_swizzle(const struct ac_surf_config *config, const struct r
return surf->modifier == DRM_FORMAT_MOD_INVALID && return surf->modifier == DRM_FORMAT_MOD_INVALID &&
!(surf->flags & (RADEON_SURF_Z_OR_SBUFFER | RADEON_SURF_SHAREABLE | !(surf->flags & (RADEON_SURF_Z_OR_SBUFFER | RADEON_SURF_SHAREABLE |
RADEON_SURF_HOST_TRANSFER)) && RADEON_SURF_HOST_TRANSFER | RADEON_SURF_DECODE_DST |
RADEON_SURF_ENCODE_SRC | RADEON_SURF_ALIASED |
RADEON_SURF_REPLAYABLE)) &&
!get_display_flag(config, surf); !get_display_flag(config, surf);
} }
} }

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

@ -75,6 +75,10 @@ enum radeon_micro_mode
#define RADEON_SURF_PREFER_64K_ALIGNMENT (1ull << 37) #define RADEON_SURF_PREFER_64K_ALIGNMENT (1ull << 37)
#define RADEON_SURF_VIDEO_REFERENCE (1ull << 38) #define RADEON_SURF_VIDEO_REFERENCE (1ull << 38)
#define RADEON_SURF_HOST_TRANSFER (1ull << 39) #define RADEON_SURF_HOST_TRANSFER (1ull << 39)
#define RADEON_SURF_DECODE_DST (1ull << 40)
#define RADEON_SURF_ENCODE_SRC (1ull << 41)
#define RADEON_SURF_ALIASED (1ull << 42)
#define RADEON_SURF_REPLAYABLE (1ull << 43)
struct legacy_surf_level { struct legacy_surf_level {
uint32_t offset_256B; /* divided by 256, the hw can only do 40-bit addresses */ uint32_t offset_256B; /* divided by 256, the hw can only do 40-bit addresses */

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

@ -718,6 +718,15 @@ radv_get_surface_flags(struct radv_device *device, struct radv_image *image, uns
!(pCreateInfo->usage & (VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR | VK_IMAGE_USAGE_VIDEO_ENCODE_DST_BIT_KHR))) !(pCreateInfo->usage & (VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR | VK_IMAGE_USAGE_VIDEO_ENCODE_DST_BIT_KHR)))
flags |= RADEON_SURF_VIDEO_REFERENCE; flags |= RADEON_SURF_VIDEO_REFERENCE;
if (pCreateInfo->usage & VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR)
flags |= RADEON_SURF_DECODE_DST;
if (pCreateInfo->usage & VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR)
flags |= RADEON_SURF_ENCODE_SRC;
if (pCreateInfo->flags & (VK_IMAGE_CREATE_ALIAS_BIT | VK_IMAGE_CREATE_SPARSE_ALIASED_BIT))
flags |= RADEON_SURF_ALIASED;
if (pCreateInfo->flags & VK_IMAGE_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT)
flags |= RADEON_SURF_REPLAYABLE;
if (alignment && alignment->maximumRequestedAlignment && !(instance->debug_flags & RADV_DEBUG_FORCE_COMPRESS)) { if (alignment && alignment->maximumRequestedAlignment && !(instance->debug_flags & RADV_DEBUG_FORCE_COMPRESS)) {
bool is_4k_capable; bool is_4k_capable;
@ -1075,10 +1084,7 @@ radv_get_ac_surf_info(struct radv_device *device, const struct radv_image *image
info.levels = image->vk.mip_levels; info.levels = image->vk.mip_levels;
info.num_channels = vk_format_get_nr_components(image->vk.format); info.num_channels = vk_format_get_nr_components(image->vk.format);
if (!image->vk.external_handle_types && if (!image->vk.external_handle_types) {
!(image->vk.create_flags & (VK_IMAGE_CREATE_SPARSE_ALIASED_BIT | VK_IMAGE_CREATE_ALIAS_BIT |
VK_IMAGE_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT)) &&
!(image->vk.usage & (VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR | VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR))) {
info.surf_index = &device->image_mrt_offset_counter; info.surf_index = &device->image_mrt_offset_counter;
info.fmask_surf_index = &device->fmask_mrt_offset_counter; info.fmask_surf_index = &device->fmask_mrt_offset_counter;
} }