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

anv/sparse: allow multiple sample bits in anv_sparse_image_check_support

Browse source 
Prepare this function in a way where the caller is able to pass
multiple sample bits as the 'samples' argument, and add an output to
the function where we return the subset of 'samples' that is actually
valid, when it's valid.

For now none of the two callers is using the new argument, but this
will be changed in the next patch.

Reviewed-by: Iván Briano <ivan.briano@intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35524>
This commit is contained in:
Paulo Zanoni 2025-06-16 16:51:55 -07:00
parent 1797337efc
commit 420cda4798
4 changed files with 40 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/intel/vulkan/anv_formats.c
View file

@ -2116,7 +2116,8 @@ void anv_GetPhysicalDeviceSparseImageFormatProperties2(
pFormatInfo->tiling,
pFormatInfo->samples,
pFormatInfo->type,
pFormatInfo->format) != VK_SUCCESS) {
pFormatInfo->format,
NULL /* valid_samples_out */) != VK_SUCCESS) {
return;
}

3
src/intel/vulkan/anv_image.c
View file

@ -2047,7 +2047,8 @@ anv_image_init_from_create_info(struct anv_device *device,
pCreateInfo->tiling,
pCreateInfo->samples,
pCreateInfo->imageType,
pCreateInfo->format);
pCreateInfo->format,
NULL /* valid_samples_out */);
if (result != VK_SUCCESS)
return result;
}

3
src/intel/vulkan/anv_private.h
View file

@ -3526,7 +3526,8 @@ VkResult anv_sparse_image_check_support(struct anv_physical_device *pdevice,
VkImageTiling tiling,
VkSampleCountFlagBits samples,
VkImageType type,
VkFormat format);
VkFormat format,
VkSampleCountFlagBits *valid_samples_out);
struct anv_buffer {
struct vk_buffer vk;

47
src/intel/vulkan/anv_sparse.c
View file

@ -1543,14 +1543,23 @@ anv_sparse_bind_image_memory(struct anv_queue *queue,
return VK_SUCCESS;
}
/* Checks if we support sparse images with the support parameters.
*
* We also return in the optional pointer 'valid_samples_out' a subset of the
* 'samples' argument containing only the sample counts supported, in case
* more than one flag is passed.
*/
VkResult
anv_sparse_image_check_support(struct anv_physical_device *pdevice,
VkImageCreateFlags flags,
VkImageTiling tiling,
VkSampleCountFlagBits samples,
VkImageType type,
VkFormat vk_format)
VkFormat vk_format,
VkSampleCountFlagBits *valid_samples_out)
{
VkSampleCountFlagBits valid_samples = samples;
assert(flags & VK_IMAGE_CREATE_SPARSE_BINDING_BIT);
/* The spec says:
@ -1594,17 +1603,24 @@ anv_sparse_image_check_support(struct anv_physical_device *pdevice,
if (tiling == VK_IMAGE_TILING_LINEAR)
return VK_ERROR_FORMAT_NOT_SUPPORTED;
if ((samples & VK_SAMPLE_COUNT_2_BIT &&
!pdevice->vk.supported_features.sparseResidency2Samples) ||
(samples & VK_SAMPLE_COUNT_4_BIT &&
!pdevice->vk.supported_features.sparseResidency4Samples) ||
(samples & VK_SAMPLE_COUNT_8_BIT &&
!pdevice->vk.supported_features.sparseResidency8Samples) ||
(samples & VK_SAMPLE_COUNT_16_BIT &&
!pdevice->vk.supported_features.sparseResidency16Samples) ||
samples & VK_SAMPLE_COUNT_32_BIT ||
samples & VK_SAMPLE_COUNT_64_BIT)
if (!pdevice->vk.supported_features.sparseResidency2Samples)
valid_samples &= ~VK_SAMPLE_COUNT_2_BIT;
if (!pdevice->vk.supported_features.sparseResidency4Samples)
valid_samples &= ~VK_SAMPLE_COUNT_4_BIT;
if (!pdevice->vk.supported_features.sparseResidency8Samples)
valid_samples &= ~VK_SAMPLE_COUNT_8_BIT;
if (!pdevice->vk.supported_features.sparseResidency16Samples)
valid_samples &= ~VK_SAMPLE_COUNT_16_BIT;
valid_samples &= ~(VK_SAMPLE_COUNT_32_BIT | VK_SAMPLE_COUNT_64_BIT);
/* Here we return NOT_PRESENT since the user is asking for sample counts we
* already reported we don't support with sparse.
*/
if (!valid_samples) {
if (valid_samples_out)
*valid_samples_out = 0;
return VK_ERROR_FEATURE_NOT_PRESENT;
}
/* While the Vulkan spec allows us to support depth/stencil sparse images
* everywhere, sometimes we're not able to have them with the tiling
@ -1623,8 +1639,7 @@ anv_sparse_image_check_support(struct anv_physical_device *pdevice,
* depth/stencil are different, and only the color layout is compatible
* with the standard block shapes.
*/
if (samples != VK_SAMPLE_COUNT_1_BIT)
return VK_ERROR_FORMAT_NOT_SUPPORTED;
valid_samples &= VK_SAMPLE_COUNT_1_BIT;
/* For 125+, isl_gfx125_filter_tiling() claims 3D is not supported.
* For the previous platforms, isl_gfx6_filter_tiling() says only 2D is
@ -1677,5 +1692,11 @@ anv_sparse_image_check_support(struct anv_physical_device *pdevice,
vk_format == VK_FORMAT_B8G8R8G8_422_UNORM)
return VK_ERROR_FORMAT_NOT_SUPPORTED;
if (valid_samples_out)
*valid_samples_out = valid_samples;
if (!valid_samples)
return VK_ERROR_FORMAT_NOT_SUPPORTED;
return VK_SUCCESS;
}