Module: vkd3d Branch: master Commit: 7e6dd8a895800042b739115ec3678ec2c71fb3c9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7e6dd8a895800042b739115e...
Author: Zebediah Figura zfigura@codeweavers.com Date: Mon Sep 28 22:41:09 2020 -0500
vkd3d-compiler: Add support for specifying the HLSL shader profile.
Signed-off-by: Zebediah Figura zfigura@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
programs/vkd3d-compiler/main.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index dd2ce93..dbc6469 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -42,6 +42,7 @@ enum OPTION_OUTPUT, OPTION_PRINT_SOURCE_TYPES, OPTION_PRINT_TARGET_TYPES, + OPTION_PROFILE, OPTION_STRIP_DEBUG, OPTION_VERSION, OPTION_TEXT_FORMATTING, @@ -171,6 +172,7 @@ static void print_usage(const char *program_name) " --print-source-types Display the supported source types and exit.\n" " --print-target-types Display the supported target types for the specified\n" " source type and exit.\n" + " -p, --profile=<name> Specify the target shader profile for HLSL shaders.\n" " --strip-debug Strip debug information from the output.\n" " -V, --version Display version information and exit.\n" " -x <type> Specify the type of the source. Valid values are\n" @@ -188,6 +190,7 @@ struct options { const char *filename; const char *output_filename; + const char *profile; enum vkd3d_shader_source_type source_type; enum vkd3d_shader_target_type target_type; bool print_version; @@ -381,6 +384,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) {"formatting", required_argument, NULL, OPTION_TEXT_FORMATTING}, {"print-source-types", no_argument, NULL, OPTION_PRINT_SOURCE_TYPES}, {"print-target-types", no_argument, NULL, OPTION_PRINT_TARGET_TYPES}, + {"profile", required_argument, NULL, OPTION_PROFILE}, {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, {"version", no_argument, NULL, OPTION_VERSION}, {NULL, 0, NULL, 0}, @@ -394,7 +398,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options)
for (;;) { - if ((option = getopt_long(argc, argv, "b:ho:Vx:", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "b:ho:p:Vx:", long_options, NULL)) == -1) break;
switch (option) @@ -421,6 +425,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->output_filename = optarg; break;
+ case OPTION_PROFILE: + case 'p': + options->profile = optarg; + break; + case OPTION_TEXT_FORMATTING: if (!parse_formatting(&options->formatting, &options->explicit_colour, optarg)) return false; @@ -565,6 +574,7 @@ static bool has_colour(FILE *f)
int main(int argc, char **argv) { + struct vkd3d_shader_hlsl_source_info hlsl_source_info = {0}; bool close_input = false, close_output = false; struct vkd3d_shader_compile_info info; struct vkd3d_shader_code spirv; @@ -626,7 +636,7 @@ int main(int argc, char **argv) add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, options.formatting);
info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; - info.next = NULL; + info.next = &hlsl_source_info; info.source_type = options.source_type; info.target_type = options.target_type; info.options = options.compile_options; @@ -634,6 +644,9 @@ int main(int argc, char **argv) info.log_level = VKD3D_SHADER_LOG_INFO; info.source_name = options.filename;
+ hlsl_source_info.type = VKD3D_SHADER_STRUCTURE_TYPE_HLSL_SOURCE_INFO; + hlsl_source_info.profile = options.profile; + if (!read_shader(&info.source, input)) { fprintf(stderr, "Failed to read input shader.\n");