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

panvk: Add create_shader_from_binary

Browse source 
This allows creation of a panvk_shader from raw binary.
This will be used by precomp shaders.

Signed-off-by: Mary Guillemard <mary.guillemard@collabora.com>
Acked-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32720>
This commit is contained in:
Mary Guillemard 2024-12-09 10:32:01 +01:00 • committed by Marge Bot
parent e67b146b03
commit 3d2cc01f8a
2 changed files with 45 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/panfrost/vulkan/panvk_shader.h
View file

@ -285,6 +285,7 @@ struct panvk_shader {
const void *bin_ptr; const void *bin_ptr;
uint32_t bin_size; uint32_t bin_size;
bool own_bin;
struct panvk_priv_mem code_mem; struct panvk_priv_mem code_mem;
@ -373,4 +374,9 @@ VkResult panvk_per_arch(create_internal_shader)(
struct panfrost_compile_inputs *compiler_inputs, struct panfrost_compile_inputs *compiler_inputs,
struct panvk_internal_shader **shader_out); struct panvk_internal_shader **shader_out);
VkResult panvk_per_arch(create_shader_from_binary)(
struct panvk_device *dev, const struct pan_shader_info *info,
struct pan_compute_dim local_size, const void *bin_ptr, size_t bin_size,
struct panvk_shader **shader_out);
#endif #endif

40
src/panfrost/vulkan/panvk_vX_shader.c
View file

@ -1065,7 +1065,9 @@ panvk_shader_destroy(struct vk_device *vk_dev, struct vk_shader *vk_shader,
} }
#endif #endif
free((void *)shader->bin_ptr); if (shader->own_bin)
free((void *)shader->bin_ptr);
vk_shader_free(&dev->vk, pAllocator, &shader->vk); vk_shader_free(&dev->vk, pAllocator, &shader->vk);
} }
@ -1093,6 +1095,7 @@ panvk_compile_shader(struct panvk_device *dev,
if (shader == NULL) if (shader == NULL)
return panvk_error(dev, VK_ERROR_OUT_OF_HOST_MEMORY); return panvk_error(dev, VK_ERROR_OUT_OF_HOST_MEMORY);
shader->own_bin = true;
struct panfrost_compile_inputs inputs = { struct panfrost_compile_inputs inputs = {
.gpu_id = phys_dev->kmod.props.gpu_prod_id, .gpu_id = phys_dev->kmod.props.gpu_prod_id,
.no_ubo_to_push = true, .no_ubo_to_push = true,
@ -1135,6 +1138,41 @@ panvk_compile_shader(struct panvk_device *dev,
return result; return result;
} }
VkResult
panvk_per_arch(create_shader_from_binary)(struct panvk_device *dev,
const struct pan_shader_info *info,
struct pan_compute_dim local_size,
const void *bin_ptr, size_t bin_size,
struct panvk_shader **shader_out)
{
struct panvk_shader *shader;
VkResult result;
shader = vk_shader_zalloc(&dev->vk, &panvk_shader_ops, info->stage,
&dev->vk.alloc, sizeof(*shader));
if (shader == NULL)
return panvk_error(dev, VK_ERROR_OUT_OF_HOST_MEMORY);
shader->info = *info;
shader->local_size = local_size;
shader->bin_ptr = bin_ptr;
shader->bin_size = bin_size;
shader->own_bin = false;
shader->nir_str = NULL;
shader->asm_str = NULL;
result = panvk_shader_upload(dev, shader, &dev->vk.alloc);
if (result != VK_SUCCESS) {
panvk_shader_destroy(&dev->vk, &shader->vk, &dev->vk.alloc);
return result;
}
*shader_out = shader;
return result;
}
static VkResult static VkResult
panvk_compile_shaders(struct vk_device *vk_dev, uint32_t shader_count, panvk_compile_shaders(struct vk_device *vk_dev, uint32_t shader_count,
struct vk_shader_compile_info *infos, struct vk_shader_compile_info *infos,