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: Implement addition and subtraction in #if directives.

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-01-19 11:18:20 -06:00 committed by Alexandre Julliard
parent be7e06cd4a
commit 76383b244b
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -336,6 +336,7 @@ static void free_parse_arg_names(struct parse_arg_names *args)
%type <integer> primary_expr %type <integer> primary_expr
%type <integer> unary_expr %type <integer> unary_expr
%type <integer> mul_expr %type <integer> mul_expr
%type <integer> add_expr
%type <string> body_token %type <string> body_token
%type <const_string> body_token_const %type <const_string> body_token_const
%type <string_buffer> body_text %type <string_buffer> body_text
@ -489,7 +490,7 @@ directive
} }
vkd3d_free($2); vkd3d_free($2);
} }
| T_IF mul_expr T_NEWLINE | T_IF add_expr T_NEWLINE
{ {
if (!preproc_push_if(ctx, !!$2)) if (!preproc_push_if(ctx, !!$2))
YYABORT; YYABORT;
@ -504,7 +505,7 @@ directive
preproc_push_if(ctx, !preproc_find_macro(ctx, $2)); preproc_push_if(ctx, !preproc_find_macro(ctx, $2));
vkd3d_free($2); vkd3d_free($2);
} }
| T_ELIF mul_expr T_NEWLINE | T_ELIF add_expr T_NEWLINE
{ {
const struct preproc_file *file = preproc_get_top_file(ctx); const struct preproc_file *file = preproc_get_top_file(ctx);
@ -656,3 +657,14 @@ mul_expr
} }
$$ = $1 / $3; $$ = $1 / $3;
} }
add_expr
: mul_expr
| add_expr '+' mul_expr
{
$$ = $1 + $3;
}
| add_expr '-' mul_expr
{
$$ = $1 - $3;
}