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

radv: use vk_image::samples instead of radv_image::info::storage_samples

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22816>
This commit is contained in:
Samuel Pitoiset
2023-05-03 08:25:02 +02:00
committed by Marge Bot
parent 8e62bb0dfe
commit d37b020428
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/amd/vulkan/radv_image.c
View File

@@ -1508,7 +1508,7 @@ radv_image_alloc_single_sample_cmask(const struct radv_device *device,
(image->vk.create_flags & VK_IMAGE_CREATE_SPARSE_BINDING_BIT))
return;
assert(image->info.storage_samples == 1);
assert(image->vk.samples == 1);
surf->cmask_offset = align64(surf->total_size, 1ull << surf->cmask_alignment_log2);
surf->total_size = surf->cmask_offset + surf->cmask_size;
@@ -1762,7 +1762,7 @@ radv_image_create_layout(struct radv_device *device, struct radv_image_create_in
if (create_info.bo_metadata && !mod_info &&
!ac_surface_apply_umd_metadata(&device->physical_device->rad_info,
&image->planes[plane].surface, image_info.storage_samples,
&image->planes[plane].surface, image->vk.samples,
image->vk.mip_levels, create_info.bo_metadata->size_metadata,
create_info.bo_metadata->metadata))
return VK_ERROR_INVALID_EXTERNAL_HANDLE;

2
src/amd/vulkan/radv_rmv.c
View File

@@ -586,7 +586,7 @@ radv_rmv_log_image_create(struct radv_device *device, const VkImageCreateInfo *c
token.image.tiling = create_info->tiling;
token.image.alignment_log2 = util_logbase2(image->alignment);
token.image.log2_samples = util_logbase2(image->info.samples);
token.image.log2_storage_samples = util_logbase2(image->info.storage_samples);
token.image.log2_storage_samples = util_logbase2(image->vk.samples);
token.image.metadata_alignment_log2 = image->planes[0].surface.meta_alignment_log2;
token.image.image_alignment_log2 = image->planes[0].surface.alignment_log2;
token.image.size = image->size;