January 2021 - Wine-commits

Zebediah Figura : vkd3d-shader: Implement #ifdef.
by Alexandre Julliard 12 Jan '21

12 Jan '21

Module: vkd3d Branch: master Commit: b0dbb35ec7131db4f415a1d91f320c52f0935e8a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b0dbb35ec7131db4f415a1d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 7 11:48:07 2021 -0600 vkd3d-shader: Implement #ifdef. 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 | 4 ++++ libs/vkd3d-shader/preproc.y | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 89c205f..12a2e9d 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -110,6 +110,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* return T_ENDIF; if (!strcmp(p, "if")) return T_IF; + if (!strcmp(p, "ifdef")) + return T_IFDEF; preproc_warning(ctx, yyget_lloc(yyscanner), VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE, "Ignoring unknown directive \"%s\".", yytext); @@ -199,6 +201,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) case T_ELSE: case T_ENDIF: case T_IF: + case T_IFDEF: ctx->current_directive = token; break; @@ -218,6 +221,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) case T_ELSE: case T_ENDIF: case T_IF: + case T_IFDEF: break; default: diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 45cad44..c16f230 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -183,6 +183,7 @@ static uint32_t preproc_parse_integer(const char *s) %token T_ELSE "#else" %token T_ENDIF "#endif" %token T_IF "#if" +%token T_IFDEF "#ifdef" %type <integer> expr %type <string> body_token @@ -219,6 +220,11 @@ directive if (!preproc_push_if(ctx, !!$2)) YYABORT; } + | T_IFDEF T_IDENTIFIER T_NEWLINE + { + preproc_push_if(ctx, !!preproc_find_macro(ctx, $2)); + vkd3d_free($2); + } | T_ELIF expr T_NEWLINE { if (ctx->if_count)

1 0

Zebediah Figura : vkd3d-shader: Implement #ifndef.
by Alexandre Julliard 12 Jan '21

12 Jan '21

Module: vkd3d Branch: master Commit: 568983596e20b79aa3604404f36f3a0bc8a98edf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=568983596e20b79aa360440… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 7 11:48:08 2021 -0600 vkd3d-shader: Implement #ifndef. 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 | 4 ++++ libs/vkd3d-shader/preproc.y | 6 ++++++ tests/hlsl_d3d12.c | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 12a2e9d..8f54608 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -112,6 +112,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* return T_IF; if (!strcmp(p, "ifdef")) return T_IFDEF; + if (!strcmp(p, "ifndef")) + return T_IFNDEF; preproc_warning(ctx, yyget_lloc(yyscanner), VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE, "Ignoring unknown directive \"%s\".", yytext); @@ -202,6 +204,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) case T_ENDIF: case T_IF: case T_IFDEF: + case T_IFNDEF: ctx->current_directive = token; break; @@ -222,6 +225,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) case T_ENDIF: case T_IF: case T_IFDEF: + case T_IFNDEF: break; default: diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index c16f230..e1193fb 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -184,6 +184,7 @@ static uint32_t preproc_parse_integer(const char *s) %token T_ENDIF "#endif" %token T_IF "#if" %token T_IFDEF "#ifdef" +%token T_IFNDEF "#ifndef" %type <integer> expr %type <string> body_token @@ -225,6 +226,11 @@ directive preproc_push_if(ctx, !!preproc_find_macro(ctx, $2)); vkd3d_free($2); } + | T_IFNDEF T_IDENTIFIER T_NEWLINE + { + preproc_push_if(ctx, !preproc_find_macro(ctx, $2)); + vkd3d_free($2); + } | T_ELIF expr T_NEWLINE { if (ctx->if_count) diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 38c1ab2..8b8c302 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 == 6) + if (i == 6 || i == 10 || i == 11) continue; vkd3d_test_set_context("Source \"%s\"", tests[i].source); todo_if (i <= 4 || (i >= 9 && i <= 14))

1 0

Zebediah Figura : vkd3d-shader: Implement #include.
by Alexandre Julliard 12 Jan '21

12 Jan '21

Module: vkd3d Branch: master Commit: 8c927c491c87510cad43b7106c9fba1cdde50cfd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8c927c491c87510cad43b71… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 7 11:48:09 2021 -0600 vkd3d-shader: Implement #include. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.h | 30 +++++- libs/vkd3d-shader/preproc.l | 125 ++++++++++++++++++++----- libs/vkd3d-shader/preproc.y | 155 +++++++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/hlsl_d3d12.c | 16 ++-- 5 files changed, 281 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=8c927c491c87510cad4…

1 0

Zebediah Figura : vkd3d-shader: Implement #undef.
by Alexandre Julliard 12 Jan '21

12 Jan '21

Module: vkd3d Branch: master Commit: 1fc8b85879cbc3189be8198711047ed131d4ae6f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1fc8b85879cbc3189be8198… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 7 11:48:10 2021 -0600 vkd3d-shader: Implement #undef. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 3 +++ libs/vkd3d-shader/preproc.y | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index ad006fa..476c1e5 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -126,6 +126,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* return T_IFDEF; if (!strcmp(p, "ifndef")) return T_IFNDEF; + if (!strcmp(p, "undef")) + return T_UNDEF; preproc_warning(ctx, yyget_lloc(yyscanner), VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE, "Ignoring unknown directive \"%s\".", yytext); @@ -257,6 +259,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) case T_IFDEF: case T_IFNDEF: case T_INCLUDE: + case T_UNDEF: ctx->current_directive = token; break; diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index fd5d011..53ce3e5 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -282,6 +282,7 @@ static const void *get_parent_data(struct preproc_ctx *ctx) %token T_IFDEF "#ifdef" %token T_IFNDEF "#ifndef" %token T_INCLUDE "#include" +%token T_UNDEF "#undef" %type <integer> expr %type <string> body_token @@ -313,6 +314,18 @@ directive if (!preproc_add_macro(ctx, &@$, $2)) YYABORT; } + | T_UNDEF T_IDENTIFIER T_NEWLINE + { + struct preproc_macro *macro; + + if ((macro = preproc_find_macro(ctx, $2))) + { + TRACE("Removing macro definition %s.\n", debugstr_a($2)); + rb_remove(&ctx->macros, &macro->entry); + preproc_free_macro(macro); + } + vkd3d_free($2); + } | T_IF expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2))

1 0

Henri Verbeet : vkd3d-shader: Decorate "precise" arithmetic instructions with SpvDecorationNoContraction.
by Alexandre Julliard 12 Jan '21

12 Jan '21

Module: vkd3d Branch: master Commit: 73a937edd035e82155825abf406734c224cc666d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=73a937edd035e82155825ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 12 13:12:52 2021 +0100 vkd3d-shader: Decorate "precise" arithmetic instructions with SpvDecorationNoContraction. 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/spirv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 61d0d47..27bf40b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6368,6 +6368,8 @@ static void vkd3d_dxbc_compiler_emit_alu_instruction(struct vkd3d_dxbc_compiler val_id = vkd3d_spirv_build_op_trv(builder, &builder->function_stream, op, type_id, src_ids, instruction->src_count); + if (instruction->flags & VKD3DSI_PRECISE_XYZW) + vkd3d_spirv_build_op_decorate(builder, val_id, SpvDecorationNoContraction, NULL, 0); vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } @@ -6600,6 +6602,8 @@ static void vkd3d_dxbc_compiler_emit_dot(struct vkd3d_dxbc_compiler *compiler, val_id = vkd3d_dxbc_compiler_emit_construct_vector(compiler, component_type, component_count, val_id, 0, 1); } + if (instruction->flags & VKD3DSI_PRECISE_XYZW) + vkd3d_spirv_build_op_decorate(builder, val_id, SpvDecorationNoContraction, NULL, 0); vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); }

1 0

Julian Rüger : German translation for release 6.0-rc3.
by Alexandre Julliard 11 Jan '21

11 Jan '21

Module: website Branch: master Commit: f7ac82444358ad4a5c46ee3a1bcbc1e34fc7d923 URL: https://source.winehq.org/git/website.git/?a=commit;h=f7ac82444358ad4a5c46e… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jan 11 11:44:09 2021 +0100 German translation for release 6.0-rc3. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020121801.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2020121801.xml b/news/de/2020121801.xml new file mode 100644 index 00000000..ed3bc124 --- /dev/null +++ b/news/de/2020121801.xml @@ -0,0 +1,12 @@ +<news> +<date>18. Dezember 2020</date> +<title>Wine 6.0-rc3 freigegeben</title> +<body> + Die Entwicklungsversion 6.0-rc3 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/6.0-rc3">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-Freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.0/wine-6.0-rc3.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 6.0-rc4.
by Alexandre Julliard 11 Jan '21

11 Jan '21

Module: website Branch: master Commit: cc8a462b3daa2c1affa99a745e674abdd6b2ffbb URL: https://source.winehq.org/git/website.git/?a=commit;h=cc8a462b3daa2c1affa99… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jan 11 11:44:38 2021 +0100 German translation for release 6.0-rc4. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020122601.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2020122601.xml b/news/de/2020122601.xml new file mode 100644 index 00000000..7d21fc07 --- /dev/null +++ b/news/de/2020122601.xml @@ -0,0 +1,12 @@ +<news> +<date>26. Dezember 2020</date> +<title>Wine 6.0-rc4 freigegeben</title> +<body> + Die Entwicklungsversion 6.0-rc4 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/6.0-rc4">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-Freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.0/wine-6.0-rc4.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 6.0-rc5.
by Alexandre Julliard 11 Jan '21

11 Jan '21

Module: website Branch: master Commit: cda8856afc33d1ba68ad33572cb8d679efe924f0 URL: https://source.winehq.org/git/website.git/?a=commit;h=cda8856afc33d1ba68ad3… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jan 11 11:45:13 2021 +0100 German translation for release 6.0-rc5. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2021010201.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2021010201.xml b/news/de/2021010201.xml new file mode 100644 index 00000000..c8e1fb95 --- /dev/null +++ b/news/de/2021010201.xml @@ -0,0 +1,12 @@ +<news> +<date>2. Januar 2021</date> +<title>Wine 6.0-rc5 freigegeben</title> +<body> + Die Entwicklungsversion 6.0-rc5 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/6.0-rc5">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-Freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.0/wine-6.0-rc5.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 6.0-rc6.
by Alexandre Julliard 11 Jan '21

11 Jan '21

Module: website Branch: master Commit: 15ae33e3a70a43dedaa119e277152504ec4c495d URL: https://source.winehq.org/git/website.git/?a=commit;h=15ae33e3a70a43dedaa11… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jan 11 11:46:42 2021 +0100 German translation for release 6.0-rc6. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2021010801.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/de/2021010801.xml b/news/de/2021010801.xml new file mode 100644 index 00000000..8ae46de0 --- /dev/null +++ b/news/de/2021010801.xml @@ -0,0 +1,13 @@ +<news> +<date>8. Januar 2021</date> +<title>Wine 6.0-rc6 freigegeben</title> +<body> + Die Entwicklungsversion 6.0-rc6 von Wine ist jetzt verfügbar. + Sofern keine Probleme in letzter Minute auftreten, ist dies voraussichtlich der letzte Release Candidate vor dem finalen 6.0. + <a href="{$root}/announce/6.0-rc6">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-Freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.0/wine-6.0-rc6.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 6.0-rc6
by Alexandre Julliard 08 Jan '21

08 Jan '21

Module: website Branch: master Commit: 839db55067bd2f2c999b148190fa460d9268143d URL: https://source.winehq.org/git/website.git/?a=commit;h=839db55067bd2f2c999b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 8 22:05:18 2021 +0100 Wine release 6.0-rc6 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021010801.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2021010801.xml b/news/en/2021010801.xml new file mode 100644 index 00000000..8b292427 --- /dev/null +++ b/news/en/2021010801.xml @@ -0,0 +1,13 @@ +<news> +<date>January 8, 2021</date> +<title>Wine 6.0-rc6 Released</title> +<body> + The Wine development release 6.0-rc6 is now available. + Barring any last minute issue, this is expected to be the last release candidate before the final 6.0. + <a href="{$root}/announce/6.0-rc6">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/6.0/wine-6.0-rc6.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