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/hlsl: Allow majority modifiers on function declarations.

Browse Source 
Signed-off-by: Giovanni Mascellani <gmascellani@codeweavers.com>
Signed-off-by: Francisco Casas <fcasas@codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Giovanni Mascellani 2022-05-10 15:08:37 +02:00 committed by Alexandre Julliard
parent e39559690b
commit bb49bdba6a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2726,14 +2726,18 @@ func_prototype:
/* var_modifiers is necessary to avoid shift/reduce conflicts. */ /* var_modifiers is necessary to avoid shift/reduce conflicts. */
var_modifiers type var_identifier '(' parameters ')' colon_attribute var_modifiers type var_identifier '(' parameters ')' colon_attribute
{ {
unsigned int modifiers = $1;
struct hlsl_ir_var *var; struct hlsl_ir_var *var;
struct hlsl_type *type;
if ($1) if (modifiers & ~HLSL_MODIFIERS_MAJORITY_MASK)
{ {
hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER,
"Modifiers are not allowed on functions."); "Only majority modifiers are allowed on functions.");
YYABORT; YYABORT;
} }
if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1)))
YYABORT;
if ((var = hlsl_get_var(ctx->globals, $3))) if ((var = hlsl_get_var(ctx->globals, $3)))
{ {
hlsl_error(ctx, &@3, VKD3D_SHADER_ERROR_HLSL_REDEFINED, hlsl_error(ctx, &@3, VKD3D_SHADER_ERROR_HLSL_REDEFINED,
@ -2742,7 +2746,7 @@ func_prototype:
"\"%s\" was previously declared here.", $3); "\"%s\" was previously declared here.", $3);
YYABORT; YYABORT;
} }
if (hlsl_types_are_equal($2, ctx->builtin_types.Void) && $7.semantic.name) if (hlsl_types_are_equal(type, ctx->builtin_types.Void) && $7.semantic.name)
{ {
hlsl_error(ctx, &@7, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, hlsl_error(ctx, &@7, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC,
"Semantics are not allowed on void functions."); "Semantics are not allowed on void functions.");
@ -2751,7 +2755,7 @@ func_prototype:
if ($7.reg_reservation.type) if ($7.reg_reservation.type)
FIXME("Unexpected register reservation for a function.\n"); FIXME("Unexpected register reservation for a function.\n");
if (!($$.decl = hlsl_new_func_decl(ctx, $2, $5, &$7.semantic, @3))) if (!($$.decl = hlsl_new_func_decl(ctx, type, $5, &$7.semantic, @3)))
YYABORT; YYABORT;
$$.name = $3; $$.name = $3;
ctx->cur_function = $$.decl; ctx->cur_function = $$.decl;