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-shader/fx: Remove newlines from the parser error messages.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2024-11-22 02:22:04 +01:00 committed by Henri Verbeet
parent 3784919213
commit b314a9eb84
Notes: Henri Verbeet 2024-11-24 00:10:58 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1272
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/vkd3d-shader/fx.c
View File

@ -2967,7 +2967,7 @@ static void VKD3D_PRINTF_FUNC(3, 4) fx_parser_error(struct fx_parser *parser, en
static int fx_2_parse(struct fx_parser *parser) static int fx_2_parse(struct fx_parser *parser)
{ {
fx_parser_error(parser, VKD3D_SHADER_ERROR_FX_NOT_IMPLEMENTED, "Parsing fx_2_0 binaries is not implemented.\n"); fx_parser_error(parser, VKD3D_SHADER_ERROR_FX_NOT_IMPLEMENTED, "Parsing fx_2_0 binaries is not implemented.");
return -1; return -1;
} }
@ -3136,7 +3136,7 @@ static void fx_parse_fx_4_annotations(struct fx_parser *parser)
else else
{ {
fx_parser_error(parser, VKD3D_SHADER_ERROR_FX_INVALID_DATA, fx_parser_error(parser, VKD3D_SHADER_ERROR_FX_INVALID_DATA,
"Only numeric and string types are supported in annotations.\n"); "Only numeric and string types are supported in annotations.");
} }
if (type.element_count) if (type.element_count)
@ -3259,7 +3259,7 @@ static void fx_4_parse_shader_blob(struct fx_parser *parser, unsigned int object
if ((ret = vkd3d_shader_compile(&info, &output, NULL)) < 0) if ((ret = vkd3d_shader_compile(&info, &output, NULL)) < 0)
{ {
fx_parser_error(parser, VKD3D_SHADER_ERROR_FX_INVALID_DATA, fx_parser_error(parser, VKD3D_SHADER_ERROR_FX_INVALID_DATA,
"Failed to disassemble shader blob.\n"); "Failed to disassemble shader blob.");
return; return;
} }
parse_fx_print_indent(parser); parse_fx_print_indent(parser);
@ -3410,7 +3410,7 @@ static void fx_4_parse_state_object_initializer(struct fx_parser *parser, uint32
if (!(state = bsearch(&entry.id, fx_4_states, ARRAY_SIZE(fx_4_states), if (!(state = bsearch(&entry.id, fx_4_states, ARRAY_SIZE(fx_4_states),
sizeof(*fx_4_states), fx_4_state_id_compare))) sizeof(*fx_4_states), fx_4_state_id_compare)))
{ {
fx_parser_error(parser, VKD3D_SHADER_ERROR_FX_INVALID_DATA, "Unrecognized state id %#x.\n", entry.id); fx_parser_error(parser, VKD3D_SHADER_ERROR_FX_INVALID_DATA, "Unrecognized state id %#x.", entry.id);
break; break;
} }
@ -3527,7 +3527,7 @@ static void fx_4_parse_state_object_initializer(struct fx_parser *parser, uint32
} }
default: default:
fx_parser_error(parser, VKD3D_SHADER_ERROR_FX_NOT_IMPLEMENTED, fx_parser_error(parser, VKD3D_SHADER_ERROR_FX_NOT_IMPLEMENTED,
"Unsupported assignment type %u.\n", entry.type); "Unsupported assignment type %u.", entry.type);
} }
vkd3d_string_buffer_printf(&parser->buffer, ";\n"); vkd3d_string_buffer_printf(&parser->buffer, ";\n");
} }