AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: rework initializing/finishing samplers

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35790>
This commit is contained in:
Samuel Pitoiset
2025-06-27 12:44:46 +02:00
parent b4ea1c37ad
commit ba8bd13a14
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/vulkan/radv_sampler.c
+18 -8
View File
@@ -181,11 +181,14 @@ radv_unregister_border_color(struct radv_device *device, uint32_t index)
mtx_unlock(&device->border_color_data.mutex);
}
static void
radv_init_sampler(struct radv_device *device, struct radv_sampler *sampler, const VkSamplerCreateInfo *pCreateInfo)
void
radv_sampler_init(struct radv_device *device, struct radv_sampler *sampler, const VkSamplerCreateInfo *pCreateInfo)
{
const struct radv_physical_device *pdev = radv_device_physical(device);
const struct radv_instance *instance = radv_physical_device_instance(pdev);
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);
@@ -236,6 +239,15 @@ radv_init_sampler(struct radv_device *device, struct radv_sampler *sampler, cons
ac_build_sampler_descriptor(pdev->info.gfx_level, &ac_state, sampler->state);
}
void
radv_sampler_finish(struct radv_device *device, struct radv_sampler *sampler)
{
if (sampler->border_color_index != RADV_BORDER_COLOR_COUNT)
radv_unregister_border_color(device, sampler->border_color_index);
vk_sampler_finish(&sampler->vk);
}
VKAPI_ATTR VkResult VKAPI_CALL
radv_CreateSampler(VkDevice _device, const VkSamplerCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator,
VkSampler *pSampler)
@@ -243,11 +255,11 @@ radv_CreateSampler(VkDevice _device, const VkSamplerCreateInfo *pCreateInfo, con
VK_FROM_HANDLE(radv_device, device, _device);
struct radv_sampler *sampler;
sampler = vk_sampler_create(&device->vk, pCreateInfo, pAllocator, sizeof(*sampler));
sampler = vk_zalloc2(&device->vk.alloc, pAllocator, sizeof(*sampler), 8, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
if (!sampler)
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
radv_init_sampler(device, sampler, pCreateInfo);
radv_sampler_init(device, sampler, pCreateInfo);
*pSampler = radv_sampler_to_handle(sampler);
@@ -263,8 +275,6 @@ radv_DestroySampler(VkDevice _device, VkSampler _sampler, const VkAllocationCall
if (!sampler)
return;
if (sampler->border_color_index != RADV_BORDER_COLOR_COUNT)
radv_unregister_border_color(device, sampler->border_color_index);
vk_sampler_destroy(&device->vk, pAllocator, &sampler->vk);
radv_sampler_finish(device, sampler);
vk_free2(&device->vk.alloc, pAllocator, sampler);
}
src/amd/vulkan/radv_sampler.h
+6
View File
@@ -13,6 +13,8 @@
#include "vk_sampler.h"
struct radv_device;
struct radv_sampler {
struct vk_sampler vk;
uint32_t state[4];
@@ -21,4 +23,8 @@ struct radv_sampler {
VK_DEFINE_NONDISP_HANDLE_CASTS(radv_sampler, vk.base, VkSampler, VK_OBJECT_TYPE_SAMPLER)
void radv_sampler_init(struct radv_device *device, struct radv_sampler *sampler,
const VkSamplerCreateInfo *pCreateInfo);
void radv_sampler_finish(struct radv_device *device, struct radv_sampler *sampler);
#endif /* RADV_SAMPLER_H */