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: Implement #elif.

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2020-12-15 17:13:23 -06:00 committed by Alexandre Julliard
parent 78e31bff16
commit 6b75fb7b9c
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -243,7 +243,6 @@ XFAIL_TESTS = \
tests/hlsl-vector-indexing.shader_test \
tests/hlsl-vector-indexing-uniform.shader_test \
tests/math.shader_test \
tests/preproc-if.shader_test \
tests/preproc-ifdef.shader_test \
tests/preproc-if-expr.shader_test \
tests/preproc-invalid.shader_test \

3
libs/vkd3d-shader/preproc.l
View File

@ -100,6 +100,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]*
for (p = yytext + 1; strchr(" \t", *p); ++p)
;
if (!strcmp(p, "elif"))
return T_ELIF;
if (!strcmp(p, "else"))
return T_ELSE;
if (!strcmp(p, "endif"))
@ -189,6 +191,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner)
{
switch (token)
{
case T_ELIF:
case T_ELSE:
case T_ENDIF:
case T_IF:

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

@ -140,6 +140,7 @@ static uint32_t preproc_parse_integer(const char *s)
%token T_NEWLINE
%token T_ELIF "#elif"
%token T_ELSE "#else"
%token T_ENDIF "#endif"
%token T_IF "#if"
@ -161,6 +162,28 @@ directive
if (!preproc_push_if(ctx, !!$2))
YYABORT;
}
| T_ELIF expr T_NEWLINE
{
if (ctx->if_count)
{
struct preproc_if_state *state = &ctx->if_stack[ctx->if_count - 1];
if (state->seen_else)
{
preproc_warning(ctx, &@$, VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE, "Ignoring #elif after #else.");
}
else
{
state->current_true = $2 && !state->seen_true && preproc_was_writing(ctx);
state->seen_true = $2 || state->seen_true;
}
}
else
{
preproc_warning(ctx, &@$, VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE,
"Ignoring #elif without prior #if.");
}
}
| T_ELSE T_NEWLINE
{
if (ctx->if_count)