wine-commits January 2021

wine-commits@winehq.org

2 participants
472 discussions

Zebediah Figura : vkd3d-shader: Parse function-like macro definitions.
by Alexandre Julliard 14 Jan '21

14 Jan '21

Module: vkd3d Branch: master Commit: 0f80ac09759936a8074ca691ecd8e5034bfaccf1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0f80ac09759936a8074ca69… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 12 16:14:18 2021 -0600 vkd3d-shader: Parse function-like macro definitions. 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 | 5 +++- libs/vkd3d-shader/preproc.y | 72 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 86ca473..77f4f0dc 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -70,6 +70,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_IDENTIFIER_PAREN;} <INITIAL>{IDENTIFIER} {return T_IDENTIFIER;} /* We have no use for floats, but shouldn't parse them as integers. */ @@ -141,6 +142,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* } <INITIAL>{WS}+ {} +<INITIAL>[(),] {return yytext[0];} <INITIAL>. {return T_TEXT;} %% @@ -221,6 +223,7 @@ static int return_token(int token, YYSTYPE *lval, const char *text) switch (token) { case T_IDENTIFIER: + case T_IDENTIFIER_PAREN: case T_INTEGER: case T_STRING: case T_TEXT: @@ -321,7 +324,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) continue; } - if (token == T_IDENTIFIER) + if (token == T_IDENTIFIER || token == T_IDENTIFIER_PAREN) { struct preproc_macro *macro; diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 17bc649..3cb7de6 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -28,6 +28,12 @@ #define PREPROC_YYLTYPE struct vkd3d_shader_location +struct parse_arg_names +{ + char **args; + size_t count; +}; + } %code provides @@ -254,6 +260,15 @@ static const void *get_parent_data(struct preproc_ctx *ctx) return preproc_get_top_file(ctx)->code.code; } +static void free_parse_arg_names(struct parse_arg_names *args) +{ + unsigned int i; + + for (i = 0; i < args->count; ++i) + vkd3d_free(args->args[i]); + vkd3d_free(args->args); +} + } %define api.prefix {preproc_yy} @@ -268,11 +283,14 @@ static const void *get_parent_data(struct preproc_ctx *ctx) %union { char *string; + const char *const_string; uint32_t integer; struct vkd3d_string_buffer string_buffer; + struct parse_arg_names arg_names; } %token <string> T_IDENTIFIER +%token <string> T_IDENTIFIER_PAREN %token <string> T_INTEGER %token <string> T_STRING %token <string> T_TEXT @@ -291,7 +309,9 @@ static const void *get_parent_data(struct preproc_ctx *ctx) %type <integer> expr %type <string> body_token +%type <const_string> body_token_const %type <string_buffer> body_text +%type <arg_names> identifier_list %% @@ -302,6 +322,28 @@ shader_text vkd3d_string_buffer_printf(&ctx->buffer, "\n"); } +identifier_list + : T_IDENTIFIER + { + if (!($$.args = vkd3d_malloc(sizeof(*$$.args)))) + YYABORT; + $$.args[0] = $1; + $$.count = 1; + } + | identifier_list ',' T_IDENTIFIER + { + char **new_array; + + if (!(new_array = vkd3d_realloc($1.args, ($1.count + 1) * sizeof(*$$.args)))) + { + free_parse_arg_names(&$1); + YYABORT; + } + $$.args = new_array; + $$.count = $1.count + 1; + $$.args[$1.count] = $3; + } + body_text : %empty { @@ -316,12 +358,32 @@ body_text } vkd3d_free($2); } + | body_text body_token_const + { + if (vkd3d_string_buffer_printf(&$$, "%s ", $2) < 0) + YYABORT; + } body_token : T_IDENTIFIER + | T_IDENTIFIER_PAREN | T_INTEGER | T_TEXT +body_token_const + : '(' + { + $$ = "("; + } + | ')' + { + $$ = ")"; + } + | ',' + { + $$ = ","; + } + directive : T_DEFINE T_IDENTIFIER body_text T_NEWLINE { @@ -332,6 +394,16 @@ directive YYABORT; } } + | T_DEFINE T_IDENTIFIER_PAREN '(' identifier_list ')' body_text T_NEWLINE + { + free_parse_arg_names(&$4); + if (!preproc_add_macro(ctx, &@6, $2, &@6, &$6)) + { + vkd3d_free($2); + vkd3d_string_buffer_cleanup(&$6); + YYABORT; + } + } | T_UNDEF T_IDENTIFIER T_NEWLINE { struct preproc_macro *macro;

1 0

Zebediah Figura : vkd3d-shader: Implement macro body expansion.
by Alexandre Julliard 14 Jan '21

14 Jan '21

Module: vkd3d Branch: master Commit: 668820f069f3b757ba51499c83f8fadd9eb627ac URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=668820f069f3b757ba51499… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 12 16:14:17 2021 -0600 vkd3d-shader: Implement macro body expansion. 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 | 18 ++++++++++ libs/vkd3d-shader/preproc.l | 83 ++++++++++++++++++++++++++++++++++++++------- libs/vkd3d-shader/preproc.y | 24 +++++++++++-- tests/hlsl_d3d12.c | 9 +++-- 5 files changed, 113 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=668820f069f3b757ba5…

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

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

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

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

← Newer
1
...
38
39
40
41
42
43
44
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2021