fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 09:18:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

radv: add a new helper to make a sampler descriptor

Browse source 
For future work.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39483>
This commit is contained in:
Samuel Pitoiset 2025-08-14 10:19:57 +02:00 • committed by Marge Bot
parent afd736bfd7
commit 8da71ae5a2
1 changed files with 66 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

113
src/amd/vulkan/radv_sampler.c
View file

@ -132,17 +132,27 @@ radv_tex_filter_mode(VkSamplerReductionMode mode)
}
static uint32_t
radv_get_max_anisotropy(struct radv_device *device, const VkSamplerCreateInfo *pCreateInfo)
radv_get_max_anisotropy(const struct radv_device *device, const struct vk_sampler_state *sampler_state)
{
if (device->force_aniso >= 0)
return device->force_aniso;
if (pCreateInfo->anisotropyEnable && pCreateInfo->maxAnisotropy > 1.0f)
return (uint32_t)pCreateInfo->maxAnisotropy;
if (sampler_state->anisotropy_enable && sampler_state->max_anisotropy > 1.0f)
return (uint32_t)sampler_state->max_anisotropy;
return 0;
}
static VkBorderColor
radv_get_border_color(const struct vk_sampler_state *sampler_state)
{
const bool uses_border_color = sampler_state->address_mode_u == VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER ||
sampler_state->address_mode_v == VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER ||
sampler_state->address_mode_w == VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER;
return uses_border_color ? sampler_state->border_color : VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK;
}
static VkResult
radv_register_border_color(struct radv_device *device, VkClearColorValue value, bool request_index, uint32_t *index)
{
@ -188,33 +198,66 @@ radv_unregister_border_color(struct radv_device *device, uint32_t index)
mtx_unlock(&device->border_color_data.mutex);
}
VkResult
radv_sampler_init(struct radv_device *device, struct radv_sampler *sampler, const VkSamplerCreateInfo *pCreateInfo)
static void
radv_make_sampler_descriptor(const struct radv_device *device, const struct vk_sampler_state *sampler_state,
uint32_t border_color_index, uint32_t *desc)
{
const struct radv_physical_device *pdev = radv_device_physical(device);
const struct radv_instance *instance = radv_physical_device_instance(pdev);
const uint32_t max_aniso = radv_get_max_anisotropy(device, sampler_state);
const uint32_t max_aniso_ratio = radv_tex_aniso_filter(max_aniso);
const unsigned filter_mode = radv_tex_filter_mode(sampler_state->reduction_mode);
unsigned depth_compare_func = V_008F30_SQ_TEX_DEPTH_COMPARE_NEVER;
const bool trunc_coord =
((sampler_state->min_filter == VK_FILTER_NEAREST && sampler_state->mag_filter == VK_FILTER_NEAREST) ||
pdev->info.compiler_info.conformant_trunc_coord) &&
!instance->drirc.debug.disable_trunc_coord;
const VkBorderColor border_color = radv_get_border_color(sampler_state);
const bool disable_cube_wrap = sampler_state->flags & VK_SAMPLER_CREATE_NON_SEAMLESS_CUBE_MAP_BIT_EXT;
if (sampler_state->compare_enable)
depth_compare_func = radv_tex_compare(sampler_state->compare_op);
/* If we don't have a custom color, set the ptr to 0 */
const uint32_t border_color_ptr = border_color_index != RADV_BORDER_COLOR_COUNT ? border_color_index : 0;
struct ac_sampler_state ac_state = {
.address_mode_u = radv_tex_wrap(sampler_state->address_mode_u),
.address_mode_v = radv_tex_wrap(sampler_state->address_mode_v),
.address_mode_w = radv_tex_wrap(sampler_state->address_mode_w),
.max_aniso_ratio = max_aniso_ratio,
.depth_compare_func = depth_compare_func,
.unnormalized_coords = sampler_state->unnormalized_coordinates ? 1 : 0,
.cube_wrap = !disable_cube_wrap,
.trunc_coord = trunc_coord,
.filter_mode = filter_mode,
.mag_filter = radv_tex_filter(sampler_state->mag_filter, max_aniso),
.min_filter = radv_tex_filter(sampler_state->min_filter, max_aniso),
.mip_filter = radv_tex_mipfilter(sampler_state->mipmap_mode),
.min_lod = sampler_state->min_lod,
.max_lod = sampler_state->max_lod,
.lod_bias = sampler_state->mip_lod_bias,
.aniso_single_level = !instance->drirc.debug.disable_aniso_single_level,
.border_color_type = radv_tex_bordercolor(border_color),
.border_color_ptr = border_color_ptr,
};
ac_build_sampler_descriptor(pdev->info.gfx_level, &ac_state, desc);
}
VkResult
radv_sampler_init(struct radv_device *device, struct radv_sampler *sampler, const VkSamplerCreateInfo *pCreateInfo)
{
vk_sampler_init(&device->vk, &sampler->vk, pCreateInfo);
uint32_t max_aniso = radv_get_max_anisotropy(device, pCreateInfo);
uint32_t max_aniso_ratio = radv_tex_aniso_filter(max_aniso);
unsigned filter_mode = radv_tex_filter_mode(sampler->vk.reduction_mode);
unsigned depth_compare_func = V_008F30_SQ_TEX_DEPTH_COMPARE_NEVER;
bool trunc_coord = ((pCreateInfo->minFilter == VK_FILTER_NEAREST && pCreateInfo->magFilter == VK_FILTER_NEAREST) ||
pdev->info.compiler_info.conformant_trunc_coord) &&
!instance->drirc.debug.disable_trunc_coord;
bool uses_border_color = pCreateInfo->addressModeU == VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER ||
pCreateInfo->addressModeV == VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER ||
pCreateInfo->addressModeW == VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER;
VkBorderColor border_color = uses_border_color ? pCreateInfo->borderColor : VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK;
uint32_t border_color_ptr;
bool disable_cube_wrap = pCreateInfo->flags & VK_SAMPLER_CREATE_NON_SEAMLESS_CUBE_MAP_BIT_EXT;
if (pCreateInfo->compareEnable)
depth_compare_func = radv_tex_compare(pCreateInfo->compareOp);
sampler->border_color_index = RADV_BORDER_COLOR_COUNT;
struct vk_sampler_state sampler_state;
vk_sampler_state_init(&sampler_state, pCreateInfo);
/* Check whether a custom border color must be registered. */
const VkBorderColor border_color = radv_get_border_color(&sampler_state);
if (vk_border_color_is_custom(border_color)) {
uint32_t border_color_index = RADV_BORDER_COLOR_COUNT;
bool request_index = false;
@ -234,31 +277,7 @@ radv_sampler_init(struct radv_device *device, struct radv_sampler *sampler, cons
sampler->border_color_index = border_color_index;
}
/* If we don't have a custom color, set the ptr to 0 */
border_color_ptr = sampler->border_color_index != RADV_BORDER_COLOR_COUNT ? sampler->border_color_index : 0;
struct ac_sampler_state ac_state = {
.address_mode_u = radv_tex_wrap(pCreateInfo->addressModeU),
.address_mode_v = radv_tex_wrap(pCreateInfo->addressModeV),
.address_mode_w = radv_tex_wrap(pCreateInfo->addressModeW),
.max_aniso_ratio = max_aniso_ratio,
.depth_compare_func = depth_compare_func,
.unnormalized_coords = pCreateInfo->unnormalizedCoordinates ? 1 : 0,
.cube_wrap = !disable_cube_wrap,
.trunc_coord = trunc_coord,
.filter_mode = filter_mode,
.mag_filter = radv_tex_filter(pCreateInfo->magFilter, max_aniso),
.min_filter = radv_tex_filter(pCreateInfo->minFilter, max_aniso),
.mip_filter = radv_tex_mipfilter(pCreateInfo->mipmapMode),
.min_lod = pCreateInfo->minLod,
.max_lod = pCreateInfo->maxLod,
.lod_bias = pCreateInfo->mipLodBias,
.aniso_single_level = !instance->drirc.debug.disable_aniso_single_level,
.border_color_type = radv_tex_bordercolor(border_color),
.border_color_ptr = border_color_ptr,
};
ac_build_sampler_descriptor(pdev->info.gfx_level, &ac_state, sampler->state);
radv_make_sampler_descriptor(device, &sampler_state, sampler->border_color_index, sampler->state);
return VK_SUCCESS;
}