January 2021 - Wine-commits

Zebediah Figura : vkd3d-shader: Implement concatenation.
by Alexandre Julliard 14 Jan '21

14 Jan '21

Module: vkd3d Branch: master Commit: 33df515f103205c78a2e669ab8a8723c4c86ea90 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=33df515f103205c78a2e669… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 12 16:14:20 2021 -0600 vkd3d-shader: Implement concatenation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 22 ++++++++++++++++++++++ libs/vkd3d-shader/preproc.y | 6 ++++++ tests/hlsl_d3d12.c | 7 ++----- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 9043ade..18a59b7 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -83,6 +83,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>0[0-7]*[ul]{0,2} {return T_INTEGER;} <INITIAL>[1-9][0-9]*[ul]{0,2} {return T_INTEGER;} +<INITIAL>## {return T_CONCAT;} + <INITIAL>"&&" {return T_TEXT;} <INITIAL>"||" {return T_TEXT;} <INITIAL>"++" {return T_TEXT;} @@ -189,6 +191,18 @@ static struct preproc_macro *preproc_get_top_macro(struct preproc_ctx *ctx) return ctx->expansion_stack[ctx->expansion_count - 1].macro; } +/* Concatenation is not done for object-like macros, but is done for both + * function-like macro bodies and their arguments. */ +static bool should_concat(struct preproc_ctx *ctx) +{ + struct preproc_macro *macro; + + if (!ctx->expansion_count) + return false; + macro = ctx->expansion_stack[ctx->expansion_count - 1].macro; + return !macro || macro->arg_count; +} + static void preproc_pop_buffer(struct preproc_ctx *ctx) { if (ctx->expansion_count) @@ -375,6 +389,14 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) switch (func_state->state) { case STATE_NONE: + if (token == T_CONCAT && should_concat(ctx)) + { + while (ctx->buffer.content_size + && strchr(" \t\r\n", ctx->buffer.buffer[ctx->buffer.content_size - 1])) + --ctx->buffer.content_size; + break; + } + if (token == T_IDENTIFIER || token == T_IDENTIFIER_PAREN) { const struct preproc_text *expansion; diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 4173af0..45577f2 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -327,6 +327,8 @@ static void free_parse_arg_names(struct parse_arg_names *args) %token T_INCLUDE "#include" %token T_UNDEF "#undef" +%token T_CONCAT "##" + %type <integer> expr %type <string> body_token %type <const_string> body_token_const @@ -419,6 +421,10 @@ body_token_const { $$ = ","; } + | T_CONCAT + { + $$ = "##"; + } directive : T_DEFINE T_IDENTIFIER body_text T_NEWLINE diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 6980b99..e726798 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -349,10 +349,8 @@ static void test_preprocess(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { - if (i == 10 || i == 11) - continue; vkd3d_test_set_context("Source \"%s\"", tests[i].source); - todo_if (i <= 4 || (i >= 9 && i <= 14)) + todo_if (i <= 4 || i == 9 || (i >= 12 && i <= 14)) check_preprocess(tests[i].source, NULL, NULL, tests[i].present, tests[i].absent); } vkd3d_test_set_context(NULL); @@ -407,8 +405,7 @@ static void test_preprocess(void) ok(include_count_file2 == 2, "file2 was included %u times.\n", include_count_file2); /* Macro invocation spread across multiple files. */ - if (0) - todo check_preprocess(test_include2_top, NULL, &test_include, "pass", NULL); + check_preprocess(test_include2_top, NULL, &test_include, "pass", NULL); blob = errors = (ID3D10Blob *)0xdeadbeef; hr = D3DPreprocess(test_include_top, strlen(test_include_top), NULL, NULL, &test_include_fail, &blob, &errors);

1 0

Zebediah Figura : vkd3d-shader: Implement stringification.
by Alexandre Julliard 14 Jan '21

14 Jan '21

Module: vkd3d Branch: master Commit: d33a8964031274576dc7b713a8dd5d6355f9d587 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d33a8964031274576dc7b71… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 12 16:14:21 2021 -0600 vkd3d-shader: Implement stringification. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 41 ++++++++++++++++++++++++++++++++++++++++- libs/vkd3d-shader/preproc.y | 4 +++- tests/hlsl_d3d12.c | 2 +- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 18a59b7..388b77f 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -104,7 +104,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* const char *p; if (!ctx->last_was_newline) - return T_TEXT; + return T_HASHSTRING; for (p = yytext + 1; strchr(" \t", *p); ++p) ; @@ -247,6 +247,7 @@ static int return_token(int token, YYSTYPE *lval, const char *text) { switch (token) { + case T_HASHSTRING: case T_IDENTIFIER: case T_IDENTIFIER_PAREN: case T_INTEGER: @@ -389,6 +390,9 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) switch (func_state->state) { case STATE_NONE: + { + struct preproc_macro *macro; + if (token == T_CONCAT && should_concat(ctx)) { while (ctx->buffer.content_size @@ -397,6 +401,40 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) break; } + /* Stringification, however, is only done for function-like + * macro bodies. */ + if (token == T_HASHSTRING && (macro = preproc_get_top_macro(ctx)) && macro->arg_count) + { + const struct preproc_text *expansion; + const char *p = text + 1; + unsigned int i; + + if (ctx->current_directive) + return return_token(token, lval, text); + + while (*p == ' ' || *p == '\t') + ++p; + + vkd3d_string_buffer_printf(&ctx->buffer, "\""); + if ((expansion = find_arg_expansion(ctx, p))) + { + for (i = 0; i < expansion->text.content_size; ++i) + { + char c = expansion->text.buffer[i]; + + if (c == '\\' || c == '"') + vkd3d_string_buffer_printf(&ctx->buffer, "\\"); + vkd3d_string_buffer_printf(&ctx->buffer, "%c", c); + } + } + else + { + vkd3d_string_buffer_printf(&ctx->buffer, "%s", p); + } + vkd3d_string_buffer_printf(&ctx->buffer, "\""); + break; + } + if (token == T_IDENTIFIER || token == T_IDENTIFIER_PAREN) { const struct preproc_text *expansion; @@ -440,6 +478,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) vkd3d_string_buffer_printf(&ctx->buffer, "%s ", text); break; + } case STATE_IDENTIFIER: if (token == '(') diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 45577f2..72d6486 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -309,6 +309,7 @@ static void free_parse_arg_names(struct parse_arg_names *args) struct parse_arg_names arg_names; } +%token <string> T_HASHSTRING %token <string> T_IDENTIFIER %token <string> T_IDENTIFIER_PAREN %token <string> T_INTEGER @@ -387,7 +388,8 @@ body_text } body_token - : T_IDENTIFIER + : T_HASHSTRING + | T_IDENTIFIER | T_IDENTIFIER_PAREN | T_INTEGER | T_TEXT diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index e726798..9d8d16d 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -350,7 +350,7 @@ static void test_preprocess(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { vkd3d_test_set_context("Source \"%s\"", tests[i].source); - todo_if (i <= 4 || i == 9 || (i >= 12 && i <= 14)) + todo_if (i == 9 || (i >= 12 && i <= 14)) check_preprocess(tests[i].source, NULL, NULL, tests[i].present, tests[i].absent); } vkd3d_test_set_context(NULL);

1 0

Jeremy Newman : set width on footer
by Jeremy Newman 14 Jan '21

14 Jan '21

Module: appdb Branch: master Commit: fc98694d827117ef5574364ce55ae48ae05c5ac6 URL: https://source.winehq.org/git/appdb.git/?a=commit;h=fc98694d827117ef5574364… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 14 10:30:54 2021 -0600 set width on footer --- css/styles.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/css/styles.css b/css/styles.css index 6ed28f4..f612718 100644 --- a/css/styles.css +++ b/css/styles.css @@ -145,7 +145,9 @@ a.btn, a.btn:visited { #footer a, #footer a:visited { color: #fff; } - +#footer img { + width: 150px; +} /* =====================================================================================================================

1 0

Jeremy Newman : set size on footer logo
by Jeremy Newman 14 Jan '21

14 Jan '21

Module: bugzilla Branch: master Commit: 6ddc89989ba83e4b1a787271944f7a3e97d9e13c URL: https://source.winehq.org/git/bugzilla.git/?a=commit;h=6ddc89989ba83e4b1a78… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 14 10:17:24 2021 -0600 set size on footer logo --- styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles.css b/styles.css index f191d5c..429b7a6 100644 --- a/styles.css +++ b/styles.css @@ -170,7 +170,7 @@ BODY { text-align: right; padding-right: 20px; } -#cwfooter IMG { vertical-align: middle; } +#cwfooter IMG { vertical-align: middle; width: 150px; } /* header text */ H1.title { color: #A50D0D; border-bottom: 1px solid #A50D0D; margin: 0px; }

1 0

Jeremy Newman : set size on footer logo
by Jeremy Newman 14 Jan '21

14 Jan '21

Module: website Branch: master Commit: c121f30f1861d50e774f310c84d5b554da77beb8 URL: https://source.winehq.org/git/website.git/?a=commit;h=c121f30f1861d50e774f3… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 14 10:17:42 2021 -0600 set size on footer logo --- css/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/styles.css b/css/styles.css index 825604ab..6dbda392 100644 --- a/css/styles.css +++ b/css/styles.css @@ -373,7 +373,7 @@ hr color: #ffffff; margin: 1em 0 1em 120px; } -#whq-footer IMG { vertical-align: middle; } +#whq-footer IMG { vertical-align: middle; width: 150px; } #whq-footer .glyphicon { vertical-align: -18%; } #whq-footer A { color: #ffffff; text-decoration: none; } #whq-footer A:visited { color: #ffffff; }

1 0

Jeremy Newman : set size on footer logo
by Jeremy Newman 14 Jan '21

14 Jan '21

Module: appdb Branch: master Commit: a7b8e785596aaea7f50d227b4c793d265d45faa6 URL: https://source.winehq.org/git/appdb.git/?a=commit;h=a7b8e785596aaea7f50d227… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 14 10:16:33 2021 -0600 set size on footer logo --- css/styles.css | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/css/styles.css b/css/styles.css index f09174d..6ed28f4 100644 --- a/css/styles.css +++ b/css/styles.css @@ -68,7 +68,7 @@ a.btn, a.btn:visited { overflow: auto; } -.carousel-control.left, +.carousel-control.left, .carousel-control.right { background-image: none } @@ -194,7 +194,7 @@ a.btn, a.btn:visited { color: #ffffff; margin: 1em 0 1em 120px; } -#whq-footer IMG { vertical-align: middle; } +#whq-footer IMG { vertical-align: middle; width: 150px; } #whq-footer .glyphicon { vertical-align: -18%; } #whq-footer A { color: #ffffff; text-decoration: none; } #whq-footer A:visited { color: #ffffff; } @@ -241,7 +241,7 @@ a.btn, a.btn:visited { float: none; width: 160px; overflow: hidden; - font-size: 95%; + font-size: 95%; background: rgba(149,73,58,0.98); background: linear-gradient(to right, rgba(149,73,58,0.7) 0%, rgba(149,73,58,0.95) 10%, @@ -345,9 +345,9 @@ DIV.newsblock { margin: 0 5px 25px 10px; padding: 0; } .inline { display: inline-block; } .small { font-size: 8pt; } .cursor-pointer { cursor: pointer; } -.no-text-decoration { - text-decoration: none !important; - +.no-text-decoration { + text-decoration: none !important; + } /* IMG options */ @@ -672,10 +672,10 @@ table.whq-table tbody tr:nth-child(odd) td { } /* used for the test report form */ table.whq-table-striped tbody tr:nth-child(odd) td { - background-color: #E0E0E0; + background-color: #E0E0E0; } table.whq-table-striped tbody tr:nth-child(even) td { - background-color: #C0C0C0; + background-color: #C0C0C0; } /* box */ @@ -690,7 +690,7 @@ table.whq-table-striped tbody tr:nth-child(even) td { } TD.cline { - background-color: #EEEEEE; color: #000000; + background-color: #EEEEEE; color: #000000; text-align: center; font-weight: bold; font-size: 10pt; }

1 0

Alexandre Julliard : Wine release 6.0
by Alexandre Julliard 14 Jan '21

14 Jan '21

Module: website Branch: master Commit: a6ed9dd97977f294f515ca3c90af76c84cb27402 URL: https://source.winehq.org/git/website.git/?a=commit;h=a6ed9dd97977f294f515c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 14 16:44:21 2021 +0100 Wine release 6.0 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021011401.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2021011401.xml b/news/en/2021011401.xml new file mode 100644 index 00000000..4fe5e44b --- /dev/null +++ b/news/en/2021011401.xml @@ -0,0 +1,18 @@ +<news> +<date>January 14, 2021</date> +<title>Wine 6.0 Released</title> +<body> + The Wine team is proud to announce that the stable release Wine 6.0 is now available. + This release represents a year of development effort and over 8,300 individual changes. It contains a large number of improvements that are listed in the <a href="{$root}/announce/6.0">release notes</a> below. The areas of major changes are: + +<ul> + <li>Core modules in PE format.</li> + <li>Vulkan backend for WineD3D.</li> + <li>DirectShow and Media Foundation support.</li> + <li>Text console redesign.</li> +</ul> + + This release is dedicated to the memory of Ken Thomases, who passed away just before Christmas at the age of 51. Ken was an incredibly brilliant developer, and the mastermind behind the macOS support in Wine. We all miss his skills, his patience, and his dark sense of humor. +The source is <a href="//dl.winehq.org/wine/source/6.0/wine-6.0.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 6.0.
by Alexandre Julliard 14 Jan '21

14 Jan '21

Module: wine Branch: master Commit: 477fe4ba2fceaffe96ea3910595befeb22b717a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=477fe4ba2fceaffe96ea3910… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 14 16:42:26 2021 +0100 Release 6.0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 510 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- VERSION | 2 +- configure | 18 +-- 3 files changed, 457 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=477fe4ba2fceaffe96ea…

1 0

Tag wine-6.0 : Alexandre Julliard : Release 6.0
by Alexandre Julliard 14 Jan '21

14 Jan '21

Module: wine Branch: refs/tags/wine-6.0 Tag: 1f352a9d3a621cc5c5c8058434290583bd9aa83c URL: https://source.winehq.org/git/wine.git/?a=tag;h=1f352a9d3a621cc5c5c80584342… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 14 16:42:26 2021 +0100 Release 6.0

1 0

Zebediah Figura : vkd3d-shader: Partially implement #define.
by Alexandre Julliard 12 Jan '21

12 Jan '21

Module: vkd3d Branch: master Commit: 9a1317ff0f274dda4d56af20e42f17d2af5a08c4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9a1317ff0f274dda4d56af2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 7 11:48:06 2021 -0600 vkd3d-shader: Partially implement #define. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + libs/vkd3d-shader/preproc.h | 10 ++++++ libs/vkd3d-shader/preproc.l | 35 +++++++++++++++++-- libs/vkd3d-shader/preproc.y | 59 +++++++++++++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/hlsl_d3d12.c | 2 +- 6 files changed, 103 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 514f050..bf1d7bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -243,6 +243,7 @@ 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 \ diff --git a/libs/vkd3d-shader/preproc.h b/libs/vkd3d-shader/preproc.h index effcd99..7f77d27 100644 --- a/libs/vkd3d-shader/preproc.h +++ b/libs/vkd3d-shader/preproc.h @@ -22,6 +22,7 @@ #define __VKD3D_SHADER_PREPROC_H #include "vkd3d_shader_private.h" +#include "rbtree.h" struct preproc_if_state { @@ -33,6 +34,12 @@ struct preproc_if_state bool seen_else; }; +struct preproc_macro +{ + struct rb_entry entry; + char *name; +}; + struct preproc_ctx { void *scanner; @@ -44,6 +51,8 @@ struct preproc_ctx struct preproc_if_state *if_stack; size_t if_count, if_stack_size; + struct rb_tree macros; + int current_directive; bool last_was_newline; @@ -52,6 +61,7 @@ struct preproc_ctx bool error; }; +void preproc_free_macro(struct preproc_macro *macro) DECLSPEC_HIDDEN; void preproc_warning(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 47ad1f1..89c205f 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -67,7 +67,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <C_COMMENT,CXX_COMMENT><<EOF>> {yy_pop_state(yyscanner);} <C_COMMENT,CXX_COMMENT>. {} -<INITIAL>{IDENTIFIER} {return T_TEXT;} +<INITIAL>{IDENTIFIER} {return T_IDENTIFIER;} /* We have no use for floats, but shouldn't parse them as integers. */ @@ -100,6 +100,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* for (p = yytext + 1; strchr(" \t", *p); ++p) ; + if (!strcmp(p, "define")) + return T_DEFINE; if (!strcmp(p, "elif")) return T_ELIF; if (!strcmp(p, "else")) @@ -154,6 +156,7 @@ static int return_token(int token, YYSTYPE *lval, const char *text) { switch (token) { + case T_IDENTIFIER: case T_INTEGER: case T_TEXT: if (!(lval->string = vkd3d_strdup(text))) @@ -191,6 +194,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) { switch (token) { + case T_DEFINE: case T_ELIF: case T_ELSE: case T_ENDIF: @@ -208,8 +212,18 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) TRACE("Parsing token %d, line %d, in directive %d, string %s.\n", token, lloc->line, ctx->current_directive, debugstr_a(text)); - if (!ctx->current_directive && !preproc_is_writing(ctx)) - continue; + switch (ctx->current_directive) + { + case T_ELIF: + case T_ELSE: + case T_ENDIF: + case T_IF: + break; + + default: + if (!preproc_is_writing(ctx)) + continue; + } if (ctx->current_directive) return return_token(token, lval, text); @@ -218,6 +232,19 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) } } +static int preproc_macro_compare(const void *key, const struct rb_entry *entry) +{ + const struct preproc_macro *macro = RB_ENTRY_VALUE(entry, struct preproc_macro, entry); + const char *name = key; + + return strcmp(name, macro->name); +} + +static void preproc_macro_rb_free(struct rb_entry *entry, void *ctx) +{ + preproc_free_macro(RB_ENTRY_VALUE(entry, struct preproc_macro, entry)); +} + int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) { @@ -226,6 +253,7 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, void *output_code; vkd3d_string_buffer_init(&ctx.buffer); + rb_init(&ctx.macros, preproc_macro_compare); ctx.message_context = message_context; ctx.location.source_name = compile_info->source_name; ctx.location.line = 1; @@ -248,6 +276,7 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, } vkd3d_free(ctx.if_stack); + rb_destroy(&ctx.macros, preproc_macro_rb_free, NULL); if (ctx.error) { diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 647bb45..45cad44 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -66,6 +66,43 @@ static void yyerror(const YYLTYPE *loc, void *scanner, struct preproc_ctx *ctx, preproc_error(ctx, loc, VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX, "%s", string); } +static struct preproc_macro *preproc_find_macro(struct preproc_ctx *ctx, const char *name) +{ + struct rb_entry *entry; + + if ((entry = rb_get(&ctx->macros, name))) + return RB_ENTRY_VALUE(entry, struct preproc_macro, entry); + return NULL; +} + +static bool preproc_add_macro(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, char *name) +{ + struct preproc_macro *macro; + int ret; + + if ((macro = preproc_find_macro(ctx, name))) + { + preproc_warning(ctx, loc, VKD3D_SHADER_WARNING_PP_ALREADY_DEFINED, "Redefinition of %s.", name); + rb_remove(&ctx->macros, &macro->entry); + preproc_free_macro(macro); + } + + TRACE("Defining new macro %s.\n", debugstr_a(name)); + + if (!(macro = vkd3d_malloc(sizeof(*macro)))) + return false; + macro->name = name; + ret = rb_put(&ctx->macros, name, &macro->entry); + assert(!ret); + return true; +} + +void preproc_free_macro(struct preproc_macro *macro) +{ + vkd3d_free(macro->name); + vkd3d_free(macro); +} + static bool preproc_was_writing(struct preproc_ctx *ctx) { if (ctx->if_count < 2) @@ -135,17 +172,20 @@ static uint32_t preproc_parse_integer(const char *s) uint32_t integer; } +%token <string> T_IDENTIFIER %token <string> T_INTEGER %token <string> T_TEXT %token T_NEWLINE +%token T_DEFINE "#define" %token T_ELIF "#elif" %token T_ELSE "#else" %token T_ENDIF "#endif" %token T_IF "#if" %type <integer> expr +%type <string> body_token %% @@ -156,8 +196,25 @@ shader_text vkd3d_string_buffer_printf(&ctx->buffer, "\n"); } +body_text + : %empty + | body_text body_token + { + vkd3d_free($2); + } + +body_token + : T_IDENTIFIER + | T_INTEGER + | T_TEXT + directive - : T_IF expr T_NEWLINE + : T_DEFINE T_IDENTIFIER body_text T_NEWLINE + { + if (!preproc_add_macro(ctx, &@$, $2)) + YYABORT; + } + | T_IF expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2)) YYABORT; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b89d20e..1011be2 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -82,6 +82,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX = 4000, + VKD3D_SHADER_WARNING_PP_ALREADY_DEFINED = 4300, VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE = 4301, VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE = 4303, VKD3D_SHADER_WARNING_PP_UNTERMINATED_IF = 4305, diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 77a7ea1..38c1ab2 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -349,7 +349,7 @@ static void test_preprocess(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { - if (i == 43) + if (i == 6) continue; vkd3d_test_set_context("Source \"%s\"", tests[i].source); todo_if (i <= 4 || (i >= 9 && i <= 14))

1 0