wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Avoid using debug functions for shader error messages.

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-02-16 23:52:06 -06:00 committed by Alexandre Julliard
parent 124069907d
commit 7afe9148f0
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/vkd3d-shader/hlsl.y
View File

@ -1711,17 +1711,15 @@ hlsl_prog:
if (decl->body && $2.decl->body) if (decl->body && $2.decl->body)
{ {
hlsl_error(ctx, $2.decl->loc, hlsl_error(ctx, $2.decl->loc,
"redefinition of function %s", debugstr_a($2.name)); "redefinition of function \"%s\"", $2.name);
YYABORT; YYABORT;
} }
else if (!hlsl_type_compare(decl->return_type, $2.decl->return_type)) else if (!hlsl_type_compare(decl->return_type, $2.decl->return_type))
{ {
hlsl_error(ctx, $2.decl->loc, hlsl_error(ctx, $2.decl->loc,
"redefining function %s with a different return type", "redefining function \"%s\" with a different return type", $2.name);
debugstr_a($2.name));
hlsl_note(ctx, decl->loc, VKD3D_SHADER_LOG_ERROR, hlsl_note(ctx, decl->loc, VKD3D_SHADER_LOG_ERROR,
"%s previously declared here", "\"%s\" previously declared here", $2.name);
debugstr_a($2.name));
YYABORT; YYABORT;
} }
} }
@ -2570,7 +2568,7 @@ postfix_expr:
} }
if (!$$) if (!$$)
{ {
hlsl_error(ctx, @3, "invalid subscript %s", debugstr_a($3)); hlsl_error(ctx, @3, "invalid subscript \"%s\"", $3);
YYABORT; YYABORT;
} }
} }
@ -2580,14 +2578,14 @@ postfix_expr:
if (!(swizzle = get_swizzle(ctx, node, $3, &@3))) if (!(swizzle = get_swizzle(ctx, node, $3, &@3)))
{ {
hlsl_error(ctx, @3, "invalid swizzle %s", debugstr_a($3)); hlsl_error(ctx, @3, "invalid swizzle \"%s\"", $3);
YYABORT; YYABORT;
} }
$$ = append_unop($1, &swizzle->node); $$ = append_unop($1, &swizzle->node);
} }
else else
{ {
hlsl_error(ctx, @3, "invalid subscript %s", debugstr_a($3)); hlsl_error(ctx, @3, "invalid subscript \"%s\"", $3);
YYABORT; YYABORT;
} }
} }
@ -3098,7 +3096,7 @@ int hlsl_parser_compile(struct hlsl_ctx *ctx, const char *entrypoint)
if (!(entry_func = get_func_entry(ctx, entrypoint))) if (!(entry_func = get_func_entry(ctx, entrypoint)))
{ {
hlsl_message("error: entry point %s is not defined\n", debugstr_a(entrypoint)); hlsl_message("error: entry point \"%s\" is not defined\n", entrypoint);
return VKD3D_ERROR_INVALID_SHADER; return VKD3D_ERROR_INVALID_SHADER;
} }