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-dxbc: Add an option to ignore checksum.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-01-21 23:25:54 +01:00 committed by Alexandre Julliard
parent 75bc68962d
commit 4b80b06f28
Notes: Alexandre Julliard 2024-03-11 23:05:11 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/582
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
programs/vkd3d-dxbc/main.c
View File

@ -37,6 +37,7 @@ enum
{ {
OPTION_COLOUR = CHAR_MAX + 1, OPTION_COLOUR = CHAR_MAX + 1,
OPTION_HELP, OPTION_HELP,
OPTION_IGNORE_CHECKSUM,
OPTION_LIST, OPTION_LIST,
OPTION_LIST_DATA, OPTION_LIST_DATA,
OPTION_NO_COLOUR, OPTION_NO_COLOUR,
@ -50,6 +51,7 @@ struct options
bool list; bool list;
bool list_data; bool list_data;
bool print_version; bool print_version;
bool ignore_checksum;
struct colours struct colours
{ {
@ -86,13 +88,14 @@ static bool parse_command_line(int argc, char **argv, struct options *options)
static struct option long_options[] = static struct option long_options[] =
{ {
{"colour", no_argument, NULL, OPTION_COLOUR}, {"colour", no_argument, NULL, OPTION_COLOUR},
{"help", no_argument, NULL, OPTION_HELP}, {"help", no_argument, NULL, OPTION_HELP},
{"list", no_argument, NULL, OPTION_LIST}, {"ignore-checksum", no_argument, NULL, OPTION_IGNORE_CHECKSUM},
{"list-data", no_argument, NULL, OPTION_LIST_DATA}, {"list", no_argument, NULL, OPTION_LIST},
{"no-colour", no_argument, NULL, OPTION_NO_COLOUR}, {"list-data", no_argument, NULL, OPTION_LIST_DATA},
{"version", no_argument, NULL, OPTION_VERSION}, {"no-colour", no_argument, NULL, OPTION_NO_COLOUR},
{NULL, 0, NULL, 0}, {"version", no_argument, NULL, OPTION_VERSION},
{NULL, 0, NULL, 0},
}; };
static const struct colours colours = static const struct colours colours =
@ -133,6 +136,10 @@ static bool parse_command_line(int argc, char **argv, struct options *options)
options->print_help = true; options->print_help = true;
return true; return true;
case OPTION_IGNORE_CHECKSUM:
options->ignore_checksum = true;
break;
case 't': case 't':
case OPTION_LIST: case OPTION_LIST:
options->list = true; options->list = true;
@ -173,6 +180,7 @@ static void print_usage(const char *program_name)
" --list-data List the data contained in the DXBC sections.\n" " --list-data List the data contained in the DXBC sections.\n"
" --no-colour Disable colour, even when supported by the output.\n" " --no-colour Disable colour, even when supported by the output.\n"
" -V, --version Display version information and exit.\n" " -V, --version Display version information and exit.\n"
" --ignore-checksum Do not validate the checksum when parsing the DXBC blob.\n"
" -- Stop option processing. Any subsequent argument is\n" " -- Stop option processing. Any subsequent argument is\n"
" interpreted as a filename.\n" " interpreted as a filename.\n"
"\n" "\n"
@ -376,6 +384,7 @@ int main(int argc, char **argv)
struct options options; struct options options;
bool close_input; bool close_input;
char *messages; char *messages;
uint32_t flags;
int fail = 1; int fail = 1;
FILE *input; FILE *input;
int ret; int ret;
@ -409,7 +418,11 @@ int main(int argc, char **argv)
goto done; goto done;
} }
ret = vkd3d_shader_parse_dxbc(&dxbc, 0, &dxbc_desc, &messages); flags = 0;
if (options.ignore_checksum)
flags |= VKD3D_SHADER_PARSE_DXBC_IGNORE_CHECKSUM;
ret = vkd3d_shader_parse_dxbc(&dxbc, flags, &dxbc_desc, &messages);
if (messages) if (messages)
fputs(messages, stderr); fputs(messages, stderr);
vkd3d_shader_free_messages(messages); vkd3d_shader_free_messages(messages);