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 #pragma.

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-14 14:47:49 -06:00 committed by Alexandre Julliard
parent 92877f7a43
commit ba32e91aca
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,6 +129,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]*
return T_IFDEF; return T_IFDEF;
if (!strcmp(p, "ifndef")) if (!strcmp(p, "ifndef"))
return T_IFNDEF; return T_IFNDEF;
if (!strcmp(p, "pragma"))
return T_PRAGMA;
if (!strcmp(p, "undef")) if (!strcmp(p, "undef"))
return T_UNDEF; return T_UNDEF;
@ -352,6 +354,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner)
case T_IFDEF: case T_IFDEF:
case T_IFNDEF: case T_IFNDEF:
case T_INCLUDE: case T_INCLUDE:
case T_PRAGMA:
case T_UNDEF: case T_UNDEF:
ctx->current_directive = token; ctx->current_directive = token;
break; break;
@ -387,6 +390,16 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner)
continue; continue;
} }
if (ctx->current_directive == T_PRAGMA)
{
/* Print all tokens verbatim. */
if (token == T_PRAGMA)
vkd3d_string_buffer_printf(&ctx->buffer, "#pragma ");
else
vkd3d_string_buffer_printf(&ctx->buffer, "%s", text);
continue;
}
switch (func_state->state) switch (func_state->state)
{ {
case STATE_NONE: case STATE_NONE:

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

@ -326,6 +326,7 @@ static void free_parse_arg_names(struct parse_arg_names *args)
%token T_IFDEF "#ifdef" %token T_IFDEF "#ifdef"
%token T_IFNDEF "#ifndef" %token T_IFNDEF "#ifndef"
%token T_INCLUDE "#include" %token T_INCLUDE "#include"
%token T_PRAGMA "#pragma"
%token T_UNDEF "#undef" %token T_UNDEF "#undef"
%token T_CONCAT "##" %token T_CONCAT "##"

1
tests/hlsl_d3d12.c
View File

@ -350,7 +350,6 @@ static void test_preprocess(void)
for (i = 0; i < ARRAY_SIZE(tests); ++i) for (i = 0; i < ARRAY_SIZE(tests); ++i)
{ {
vkd3d_test_set_context("Source \"%s\"", tests[i].source); vkd3d_test_set_context("Source \"%s\"", tests[i].source);
todo_if (i == 9)
check_preprocess(tests[i].source, NULL, NULL, tests[i].present, tests[i].absent); check_preprocess(tests[i].source, NULL, NULL, tests[i].present, tests[i].absent);
} }
vkd3d_test_set_context(NULL); vkd3d_test_set_context(NULL);