wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-compiler: Also pass the entry point as part of the SPIR-V target information.

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2020-11-26 11:54:34 -06:00 committed by Alexandre Julliard
parent 2164915450
commit 584f84737b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
programs/vkd3d-compiler/main.c
View File

@ -583,6 +583,7 @@ static bool has_colour(FILE *f)
int main(int argc, char **argv) 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}; struct vkd3d_shader_hlsl_source_info hlsl_source_info = {0};
bool close_input = false, close_output = false; bool close_input = false, close_output = false;
struct vkd3d_shader_compile_info info; struct vkd3d_shader_compile_info info;
@ -654,9 +655,14 @@ int main(int argc, char **argv)
info.source_name = options.filename; info.source_name = options.filename;
hlsl_source_info.type = VKD3D_SHADER_STRUCTURE_TYPE_HLSL_SOURCE_INFO; 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.profile = options.profile;
hlsl_source_info.entry_point = options.entry_point; 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)) if (!read_shader(&info.source, input))
{ {
fprintf(stderr, "Failed to read input shader.\n"); fprintf(stderr, "Failed to read input shader.\n");