fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-08 08:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

lavapipe: split out sampler init from create

Browse source 
no functional changes

Konstantin Seurer <konstantin.seurer@gmail.com>

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32931>
This commit is contained in:
Mike Blumenkrantz 2024-10-24 11:16:40 -04:00 • committed by Marge Bot
parent 4db07aeb1c
commit 596efeda33
2 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/gallium/frontends/lavapipe/lvp_device.c
View file

@ -2489,20 +2489,9 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_ResetEvent(
return VK_SUCCESS;
}
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateSampler(
VkDevice _device,
const VkSamplerCreateInfo* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
VkSampler* pSampler)
void
lvp_sampler_init(struct lvp_device *device, struct lp_descriptor *desc, const VkSamplerCreateInfo *pCreateInfo, const struct vk_sampler *sampler)
{
LVP_FROM_HANDLE(lvp_device, device, _device);
struct lvp_sampler *sampler;
sampler = vk_sampler_create(&device->vk, pCreateInfo,
pAllocator, sizeof(*sampler));
if (!sampler)
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
struct pipe_sampler_state state = {0};
VkClearColorValue border_color =
vk_sampler_border_color_value(pCreateInfo, NULL);
@ -2528,16 +2517,33 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateSampler(
STATIC_ASSERT((unsigned)VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE == (unsigned)PIPE_TEX_REDUCTION_WEIGHTED_AVERAGE);
STATIC_ASSERT((unsigned)VK_SAMPLER_REDUCTION_MODE_MIN == (unsigned)PIPE_TEX_REDUCTION_MIN);
STATIC_ASSERT((unsigned)VK_SAMPLER_REDUCTION_MODE_MAX == (unsigned)PIPE_TEX_REDUCTION_MAX);
state.reduction_mode = (enum pipe_tex_reduction_mode)sampler->vk.reduction_mode;
state.reduction_mode = (enum pipe_tex_reduction_mode)sampler->reduction_mode;
memcpy(&state.border_color, &border_color, sizeof(border_color));
simple_mtx_lock(&device->queue.lock);
struct lp_texture_handle *texture_handle = (void *)(uintptr_t)device->queue.ctx->create_texture_handle(device->queue.ctx, NULL, &state);
sampler->desc.texture.sampler_index = texture_handle->sampler_index;
desc->texture.sampler_index = texture_handle->sampler_index;
device->queue.ctx->delete_texture_handle(device->queue.ctx, (uint64_t)(uintptr_t)texture_handle);
simple_mtx_unlock(&device->queue.lock);
lp_jit_sampler_from_pipe(&sampler->desc.sampler, &state);
lp_jit_sampler_from_pipe(&desc->sampler, &state);
}
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateSampler(
VkDevice _device,
const VkSamplerCreateInfo* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
VkSampler* pSampler)
{
LVP_FROM_HANDLE(lvp_device, device, _device);
struct lvp_sampler *sampler;
sampler = vk_sampler_create(&device->vk, pCreateInfo,
pAllocator, sizeof(*sampler));
if (!sampler)
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
lvp_sampler_init(device, &sampler->desc, pCreateInfo, &sampler->vk);
*pSampler = lvp_sampler_to_handle(sampler);

3
src/gallium/frontends/lavapipe/lvp_private.h
View file

@ -769,6 +769,9 @@ lvp_vk_format_to_pipe_format(VkFormat format)
}
}
void
lvp_sampler_init(struct lvp_device *device, struct lp_descriptor *desc, const VkSamplerCreateInfo *pCreateInfo, const struct vk_sampler *sampler);
static inline uint8_t
lvp_image_aspects_to_plane(ASSERTED const struct lvp_image *image,
VkImageAspectFlags aspectMask)