Zebediah Figura : vkd3d-compiler: Also pass the entry point as part of the SPIR-V target information.
Module: vkd3d Branch: master Commit: 584f84737b2b8a49a4f4af76db27522138bf046a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=584f84737b2b8a49a4f4af76... Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 26 11:54:34 2020 -0600 vkd3d-compiler: Also pass the entry point as part of the SPIR-V target information. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index bcca04c..3eee4bd 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -583,6 +583,7 @@ static bool has_colour(FILE *f) int main(int argc, char **argv) { + struct vkd3d_shader_spirv_target_info spirv_target_info = {0}; struct vkd3d_shader_hlsl_source_info hlsl_source_info = {0}; bool close_input = false, close_output = false; struct vkd3d_shader_compile_info info; @@ -654,9 +655,14 @@ int main(int argc, char **argv) info.source_name = options.filename; hlsl_source_info.type = VKD3D_SHADER_STRUCTURE_TYPE_HLSL_SOURCE_INFO; + hlsl_source_info.next = &spirv_target_info; hlsl_source_info.profile = options.profile; hlsl_source_info.entry_point = options.entry_point; + spirv_target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO; + spirv_target_info.entry_point = options.entry_point; + spirv_target_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0; + if (!read_shader(&info.source, input)) { fprintf(stderr, "Failed to read input shader.\n");
participants (1)
-
Alexandre Julliard