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

radv: add support for VkShaderModuleCreateInfo as pNext 

With VK_EXT_graphics_pipeline_library, modules can be passed via the
pNext of VkpipelineShaderStageCreateInfo.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15926>
This commit is contained in:
Samuel Pitoiset 2022-04-13 16:37:09 +02:00 committed by Marge Bot
parent c43573ba93
commit f049b1c085
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/amd/vulkan/radv_pipeline.c
View File

@ -4107,7 +4107,11 @@ void
radv_pipeline_stage_init(const VkPipelineShaderStageCreateInfo *sinfo, radv_pipeline_stage_init(const VkPipelineShaderStageCreateInfo *sinfo,
struct radv_pipeline_stage *out_stage, gl_shader_stage stage) struct radv_pipeline_stage *out_stage, gl_shader_stage stage)
{ {
struct vk_shader_module *module = vk_shader_module_from_handle(sinfo->module); const VkShaderModuleCreateInfo *minfo =
vk_find_struct_const(sinfo->pNext, SHADER_MODULE_CREATE_INFO);
if (sinfo->module == VK_NULL_HANDLE && !minfo)
return;
memset(out_stage, 0, sizeof(*out_stage)); memset(out_stage, 0, sizeof(*out_stage));
@ -4116,17 +4120,25 @@ radv_pipeline_stage_init(const VkPipelineShaderStageCreateInfo *sinfo,
out_stage->spec_info = sinfo->pSpecializationInfo; out_stage->spec_info = sinfo->pSpecializationInfo;
out_stage->feedback.flags = VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT; out_stage->feedback.flags = VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT;
out_stage->spirv.data = module->data; if (sinfo->module != VK_NULL_HANDLE) {
out_stage->spirv.size = module->size; struct vk_shader_module *module = vk_shader_module_from_handle(sinfo->module);
out_stage->spirv.object = &module->base;
if (module->nir) { out_stage->spirv.data = module->data;
out_stage->internal_nir = module->nir; out_stage->spirv.size = module->size;
_mesa_sha1_compute(module->nir->info.name, strlen(module->nir->info.name), out_stage->spirv.object = &module->base;
out_stage->spirv.sha1);
if (module->nir) {
out_stage->internal_nir = module->nir;
_mesa_sha1_compute(module->nir->info.name, strlen(module->nir->info.name),
out_stage->spirv.sha1);
} else {
assert(sizeof(out_stage->spirv.sha1) == sizeof(module->sha1));
memcpy(out_stage->spirv.sha1, module->sha1, sizeof(out_stage->spirv.sha1));
}
} else { } else {
assert(sizeof(out_stage->spirv.sha1) == sizeof(module->sha1)); out_stage->spirv.data = (const char *) minfo->pCode;
memcpy(out_stage->spirv.sha1, module->sha1, sizeof(out_stage->spirv.sha1)); out_stage->spirv.size = minfo->codeSize;
_mesa_sha1_compute(out_stage->spirv.data, out_stage->spirv.size, out_stage->spirv.sha1);
} }
radv_pipeline_hash_shader(out_stage->spirv.sha1, sizeof(out_stage->spirv.sha1), radv_pipeline_hash_shader(out_stage->spirv.sha1, sizeof(out_stage->spirv.sha1),