wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-compiler: Add support for specifying the entry point for HLSL shaders.

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-09-28 22:41:10 -05:00 committed by Alexandre Julliard
parent 7e6dd8a895
commit 042a2928dc
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,7 @@ enum
{ {
OPTION_HELP = CHAR_MAX + 1, OPTION_HELP = CHAR_MAX + 1,
OPTION_BUFFER_UAV, OPTION_BUFFER_UAV,
OPTION_ENTRY,
OPTION_OUTPUT, OPTION_OUTPUT,
OPTION_PRINT_SOURCE_TYPES, OPTION_PRINT_SOURCE_TYPES,
OPTION_PRINT_TARGET_TYPES, OPTION_PRINT_TARGET_TYPES,
@ -161,6 +162,7 @@ static void print_usage(const char *program_name)
" --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n"
" Valid values are 'buffer-texture' (default) and\n" " Valid values are 'buffer-texture' (default) and\n"
" 'storage-buffer'.\n" " 'storage-buffer'.\n"
" -e, --entry=<name> Use <name> as the entry point (default is \"main\").\n"
" -o, --output=<file> Write the output to <file>. If <file> is '-' or no\n" " -o, --output=<file> Write the output to <file>. If <file> is '-' or no\n"
" output file is specified, output will be written to\n" " output file is specified, output will be written to\n"
" standard output.\n" " standard output.\n"
@ -190,6 +192,7 @@ struct options
{ {
const char *filename; const char *filename;
const char *output_filename; const char *output_filename;
const char *entry_point;
const char *profile; const char *profile;
enum vkd3d_shader_source_type source_type; enum vkd3d_shader_source_type source_type;
enum vkd3d_shader_target_type target_type; enum vkd3d_shader_target_type target_type;
@ -380,6 +383,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options)
{ {
{"help", no_argument, NULL, OPTION_HELP}, {"help", no_argument, NULL, OPTION_HELP},
{"buffer-uav", required_argument, NULL, OPTION_BUFFER_UAV}, {"buffer-uav", required_argument, NULL, OPTION_BUFFER_UAV},
{"entry", required_argument, NULL, OPTION_ENTRY},
{"output", required_argument, NULL, OPTION_OUTPUT}, {"output", required_argument, NULL, OPTION_OUTPUT},
{"formatting", required_argument, NULL, OPTION_TEXT_FORMATTING}, {"formatting", required_argument, NULL, OPTION_TEXT_FORMATTING},
{"print-source-types", no_argument, NULL, OPTION_PRINT_SOURCE_TYPES}, {"print-source-types", no_argument, NULL, OPTION_PRINT_SOURCE_TYPES},
@ -398,7 +402,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options)
for (;;) for (;;)
{ {
if ((option = getopt_long(argc, argv, "b:ho:p:Vx:", long_options, NULL)) == -1) if ((option = getopt_long(argc, argv, "b:e:ho:p:Vx:", long_options, NULL)) == -1)
break; break;
switch (option) switch (option)
@ -420,6 +424,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options)
add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV, buffer_uav); add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV, buffer_uav);
break; break;
case OPTION_ENTRY:
case 'e':
options->entry_point = optarg;
break;
case OPTION_OUTPUT: case OPTION_OUTPUT:
case 'o': case 'o':
options->output_filename = optarg; options->output_filename = optarg;
@ -646,6 +655,7 @@ int main(int argc, char **argv)
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.profile = options.profile; hlsl_source_info.profile = options.profile;
hlsl_source_info.entry_point = options.entry_point;
if (!read_shader(&info.source, input)) if (!read_shader(&info.source, input))
{ {