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

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 042a2928dc9a224892f4d89455b0caeb027f24e1
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=042a2928dc9a224892f4d894...

Author: Zebediah Figura 
Date:   Mon Sep 28 22:41:10 2020 -0500

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

Signed-off-by: Zebediah Figura 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

programs/vkd3d-compiler/main.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c
index dbc6469..8b9d7c2 100644
--- a/programs/vkd3d-compiler/main.c
+++ b/programs/vkd3d-compiler/main.c
@@ -39,6 +39,7 @@ enum
 {
     OPTION_HELP = CHAR_MAX + 1,
     OPTION_BUFFER_UAV,
+    OPTION_ENTRY,
     OPTION_OUTPUT,
     OPTION_PRINT_SOURCE_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"
         "                        Valid values are 'buffer-texture' (default) and\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"
         "                        output file is specified, output will be written to\n"
         "                        standard output.\n"
@@ -190,6 +192,7 @@ struct options
 {
     const char *filename;
     const char *output_filename;
+    const char *entry_point;
     const char *profile;
     enum vkd3d_shader_source_type source_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},
         {"buffer-uav",         required_argument, NULL, OPTION_BUFFER_UAV},
+        {"entry",              required_argument, NULL, OPTION_ENTRY},
         {"output",             required_argument, NULL, OPTION_OUTPUT},
         {"formatting",         required_argument, NULL, OPTION_TEXT_FORMATTING},
         {"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 (;;)
     {
-        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;

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);
                 break;

+            case OPTION_ENTRY:
+            case 'e':
+                options->entry_point = optarg;
+                break;
+
             case OPTION_OUTPUT:
             case 'o':
                 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.profile = options.profile;
+    hlsl_source_info.entry_point = options.entry_point;

if (!read_shader(&info.source, input))
     {