winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
March 2021
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
1163 discussions
Start a n
N
ew thread
Zebediah Figura : winegstreamer: Don't invert the proportion twice in wg_parser_stream_notify_qos().
by Alexandre Julliard
17 Mar '21
17 Mar '21
Module: wine Branch: master Commit: 11612cd3a8dc672640737326c64e04d5b7bf6bba URL:
https://source.winehq.org/git/wine.git/?a=commit;h=11612cd3a8dc672640737326…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 16 16:06:31 2021 -0500 winegstreamer: Don't invert the proportion twice in wg_parser_stream_notify_qos(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index f76ca903b80..51d7e3d9748 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -694,7 +694,7 @@ static void CDECL wg_parser_stream_notify_qos(struct wg_parser_stream *stream, GstEvent *event; if (!(event = gst_event_new_qos(underflow ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, - 1000.0 / proportion, diff * 100, timestamp * 100))) + proportion, diff * 100, timestamp * 100))) ERR("Failed to create QOS event.\n"); gst_pad_push_event(stream->my_sink, event); }
1
0
0
0
Zebediah Figura : opencl: Do not prepend "wine_" to export names.
by Alexandre Julliard
17 Mar '21
17 Mar '21
Module: wine Branch: master Commit: 379d3752d5eab6c787d208f71ab3a682f3b3944a URL:
https://source.winehq.org/git/wine.git/?a=commit;h=379d3752d5eab6c787d208f7…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 15 23:44:52 2021 -0500 opencl: Do not prepend "wine_" to export names. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/make_opencl | 4 +- dlls/opencl/opencl.spec | 132 +++++++++++++++++++++++----------------------- dlls/opencl/pe_thunks.c | 126 +++++++++++++++++++++---------------------- dlls/opencl/pe_wrappers.c | 10 ++-- 4 files changed, 136 insertions(+), 136 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=379d3752d5eab6c787d2…
1
0
0
0
Zebediah Figura : opencl: Build with msvcrt.
by Alexandre Julliard
17 Mar '21
17 Mar '21
Module: wine Branch: master Commit: 08032c7831dbfb1bf3d144c749793db09eda97fa URL:
https://source.winehq.org/git/wine.git/?a=commit;h=08032c7831dbfb1bf3d144c7…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 15 23:44:51 2021 -0500 opencl: Build with msvcrt. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/Makefile.in | 2 + dlls/opencl/make_opencl | 92 ++++++++++-- dlls/opencl/opencl_private.h | 15 +- dlls/opencl/opencl_types.h | 343 +++++++++++++++++++++++++++++++++++++++++++ dlls/opencl/pe_thunks.c | 51 +++---- dlls/opencl/pe_wrappers.c | 3 +- dlls/opencl/unix_private.h | 14 ++ 7 files changed, 468 insertions(+), 52 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=08032c7831dbfb1bf3d1…
1
0
0
0
Zebediah Figura : opencl: Move libOpenCL support to a new Unix library.
by Alexandre Julliard
17 Mar '21
17 Mar '21
Module: wine Branch: master Commit: 6b15f4d614fd33ec2c81b377fe6609f2bb7bfa6c URL:
https://source.winehq.org/git/wine.git/?a=commit;h=6b15f4d614fd33ec2c81b377…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 15 23:44:50 2021 -0500 opencl: Move libOpenCL support to a new Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/Makefile.in | 6 +- dlls/opencl/make_opencl | 120 +++++++-- dlls/opencl/opencl.c | 236 ---------------- dlls/opencl/opencl_private.h | 5 + dlls/opencl/{opencl_thunks.c => pe_thunks.c} | 142 ++++++---- dlls/opencl/pe_wrappers.c | 128 +++++++++ dlls/opencl/unix_private.h | 45 ++++ dlls/opencl/unix_thunks.c | 388 +++++++++++++++++++++++++++ dlls/opencl/unix_wrappers.c | 146 ++++++++++ dlls/opencl/unixlib.h | 73 +++++ 10 files changed, 972 insertions(+), 317 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=6b15f4d614fd33ec2c81…
1
0
0
0
Matteo Bruni : vkd3d-shader: Get rid of a spurious '\n' in a HLSL compiler message.
by Alexandre Julliard
17 Mar '21
17 Mar '21
Module: vkd3d Branch: master Commit: 588d3e5a576870f093d0789412a3974675345412 URL:
https://source.winehq.org/git/vkd3d.git/?a=commit;h=588d3e5a576870f093d0789…
Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 17 13:38:14 2021 +0100 vkd3d-shader: Get rid of a spurious '\n' in a HLSL compiler message. 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/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index afac0ab..4769475 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -755,7 +755,7 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty field->semantic = v->semantic; if (v->initializer.args_count) { - hlsl_error(ctx, v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Illegal initializer on a struct field.\n"); + hlsl_error(ctx, v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Illegal initializer on a struct field."); free_parse_initializer(&v->initializer); } list_add_tail(list, &field->entry);
1
0
0
0
Zebediah Figura : vkd3d-shader: Fold redundant casts between scalars and 1-dimensional vectors.
by Alexandre Julliard
17 Mar '21
17 Mar '21
Module: vkd3d Branch: master Commit: 1b7cc143655efd3d2d9edf492fcde6eb5af6d389 URL:
https://source.winehq.org/git/vkd3d.git/?a=commit;h=1b7cc143655efd3d2d9edf4…
Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 16 16:31:56 2021 -0500 vkd3d-shader: Fold redundant casts between scalars and 1-dimensional vectors. 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/hlsl_codegen.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 2df88f5..283a67e 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -57,13 +57,24 @@ static void replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new) hlsl_free_instr(old); } +static bool is_vec1(const struct hlsl_type *type) +{ + return (type->type == HLSL_CLASS_SCALAR) || (type->type == HLSL_CLASS_VECTOR && type->dimx == 1); +} + static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { if (instr->type == HLSL_IR_EXPR) { struct hlsl_ir_expr *expr = hlsl_ir_expr(instr); + const struct hlsl_type *src_type = expr->operands[0].node->data_type; + const struct hlsl_type *dst_type = expr->node.data_type; + + if (expr->op != HLSL_IR_UNOP_CAST) + return false; - if (expr->op == HLSL_IR_UNOP_CAST && hlsl_type_compare(expr->node.data_type, expr->operands[0].node->data_type)) + if (hlsl_type_compare(src_type, dst_type) + || (src_type->base_type == dst_type->base_type && is_vec1(src_type) && is_vec1(dst_type))) { replace_node(&expr->node, expr->operands[0].node); return true;
1
0
0
0
Zebediah Figura : vkd3d-shader: Fold redundant casts.
by Alexandre Julliard
17 Mar '21
17 Mar '21
Module: vkd3d Branch: master Commit: 79d4e629110b08a35465a734eeea817fa53e0deb URL:
https://source.winehq.org/git/vkd3d.git/?a=commit;h=79d4e629110b08a35465a73…
Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 16 16:31:55 2021 -0500 vkd3d-shader: Fold redundant casts. 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/hlsl_codegen.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 22ad3ed..2df88f5 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -53,11 +53,26 @@ static void replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new) hlsl_src_remove(src); hlsl_src_from_node(src, new); } - list_add_before(&old->entry, &new->entry); list_remove(&old->entry); hlsl_free_instr(old); } +static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + if (instr->type == HLSL_IR_EXPR) + { + struct hlsl_ir_expr *expr = hlsl_ir_expr(instr); + + if (expr->op == HLSL_IR_UNOP_CAST && hlsl_type_compare(expr->node.data_type, expr->operands[0].node->data_type)) + { + replace_node(&expr->node, expr->operands[0].node); + return true; + } + } + + return false; +} + static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; @@ -116,6 +131,7 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi return false; } + list_add_before(&expr->node.entry, &res->node.entry); replace_node(&expr->node, &res->node); return true; } @@ -289,6 +305,7 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun { list_move_head(entry_func->body, &ctx->static_initializers); + while (transform_ir(ctx, fold_redundant_casts, entry_func->body, NULL)); while (transform_ir(ctx, fold_constants, entry_func->body, NULL)); while (transform_ir(ctx, dce, entry_func->body, NULL));
1
0
0
0
Zebediah Figura : vkd3d-shader: Add a dead code elimination pass.
by Alexandre Julliard
17 Mar '21
17 Mar '21
Module: vkd3d Branch: master Commit: 7c2083d37414ba0200d0ecca736b16fdd8c0491d URL:
https://source.winehq.org/git/vkd3d.git/?a=commit;h=7c2083d37414ba0200d0ecc…
Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 16 16:31:54 2021 -0500 vkd3d-shader: Add a dead code elimination pass. 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/hlsl_codegen.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index c8d8d17..22ad3ed 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -120,6 +120,32 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi return true; } +static bool dce(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + switch (instr->type) + { + case HLSL_IR_CONSTANT: + case HLSL_IR_EXPR: + case HLSL_IR_LOAD: + case HLSL_IR_SWIZZLE: + if (list_empty(&instr->uses)) + { + list_remove(&instr->entry); + hlsl_free_instr(instr); + return true; + } + break; + + case HLSL_IR_ASSIGNMENT: + case HLSL_IR_IF: + case HLSL_IR_JUMP: + case HLSL_IR_LOOP: + break; + } + + return false; +} + /* Allocate a unique, ordered index to each instruction, which will be used for * computing liveness ranges. */ static unsigned int index_instructions(struct list *instrs, unsigned int index) @@ -264,6 +290,7 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun list_move_head(entry_func->body, &ctx->static_initializers); while (transform_ir(ctx, fold_constants, entry_func->body, NULL)); + while (transform_ir(ctx, dce, entry_func->body, NULL)); /* Index 0 means unused; index 1 means function entry, so start at 2. */ index_instructions(entry_func->body, 2);
1
0
0
0
Zebediah Figura : vkd3d-shader: Fold addition and multiplication of uint constants.
by Alexandre Julliard
17 Mar '21
17 Mar '21
Module: vkd3d Branch: master Commit: 14993f34c99617881ea569f8f687dcc4a349a383 URL:
https://source.winehq.org/git/vkd3d.git/?a=commit;h=14993f34c99617881ea569f…
Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 16 16:31:53 2021 -0500 vkd3d-shader: Fold addition and multiplication of uint constants. 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/hlsl_codegen.c | 102 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 3998470..c8d8d17 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -20,6 +20,106 @@ #include "hlsl.h" +static bool transform_ir(struct hlsl_ctx *ctx, bool (*func)(struct hlsl_ctx *ctx, struct hlsl_ir_node *, void *), + struct list *instrs, void *context) +{ + struct hlsl_ir_node *instr, *next; + bool progress = 0; + + LIST_FOR_EACH_ENTRY_SAFE(instr, next, instrs, struct hlsl_ir_node, entry) + { + if (instr->type == HLSL_IR_IF) + { + struct hlsl_ir_if *iff = hlsl_ir_if(instr); + + progress |= transform_ir(ctx, func, &iff->then_instrs, context); + progress |= transform_ir(ctx, func, &iff->else_instrs, context); + } + else if (instr->type == HLSL_IR_LOOP) + progress |= transform_ir(ctx, func, &hlsl_ir_loop(instr)->body, context); + + progress |= func(ctx, instr, context); + } + + return progress; +} + +static void replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new) +{ + struct hlsl_src *src, *next; + + LIST_FOR_EACH_ENTRY_SAFE(src, next, &old->uses, struct hlsl_src, entry) + { + hlsl_src_remove(src); + hlsl_src_from_node(src, new); + } + list_add_before(&old->entry, &new->entry); + list_remove(&old->entry); + hlsl_free_instr(old); +} + +static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; + struct hlsl_ir_expr *expr; + unsigned int i; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + + for (i = 0; i < ARRAY_SIZE(expr->operands); ++i) + { + if (expr->operands[i].node && expr->operands[i].node->type != HLSL_IR_CONSTANT) + return false; + } + arg1 = hlsl_ir_constant(expr->operands[0].node); + if (expr->operands[1].node) + arg2 = hlsl_ir_constant(expr->operands[1].node); + + if (!(res = vkd3d_calloc(1, sizeof(*res)))) + { + ctx->failed = true; + return false; + } + init_node(&res->node, HLSL_IR_CONSTANT, instr->data_type, instr->loc); + + switch (instr->data_type->base_type) + { + case HLSL_TYPE_UINT: + { + unsigned int i; + + switch (expr->op) + { + case HLSL_IR_BINOP_ADD: + for (i = 0; i < instr->data_type->dimx; ++i) + res->value.u[i] = arg1->value.u[i] + arg2->value.u[i]; + break; + + case HLSL_IR_BINOP_MUL: + for (i = 0; i < instr->data_type->dimx; ++i) + res->value.u[i] = arg1->value.u[i] * arg2->value.u[i]; + break; + + default: + FIXME("Fold uint op %#x.\n", expr->op); + vkd3d_free(res); + return false; + } + break; + } + + default: + FIXME("Fold type %#x op %#x.\n", instr->data_type->base_type, expr->op); + vkd3d_free(res); + return false; + } + + replace_node(&expr->node, &res->node); + return true; +} + /* Allocate a unique, ordered index to each instruction, which will be used for * computing liveness ranges. */ static unsigned int index_instructions(struct list *instrs, unsigned int index) @@ -163,6 +263,8 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun { list_move_head(entry_func->body, &ctx->static_initializers); + while (transform_ir(ctx, fold_constants, entry_func->body, NULL)); + /* Index 0 means unused; index 1 means function entry, so start at 2. */ index_instructions(entry_func->body, 2);
1
0
0
0
Zebediah Figura : vkd3d-shader: Factor out hlsl_new_copy().
by Alexandre Julliard
17 Mar '21
17 Mar '21
Module: vkd3d Branch: master Commit: 8096e4ae7ba8fcd81ab60d1fdc71608475441f9e URL:
https://source.winehq.org/git/vkd3d.git/?a=commit;h=8096e4ae7ba8fcd81ab60d1…
Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 16 16:31:52 2021 -0500 vkd3d-shader: Factor out hlsl_new_copy(). 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/hlsl.c | 6 ++++++ libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 8 +++----- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 19c0e2e..988f64d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -382,6 +382,12 @@ struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ir_node *node, struct hlsl_type * return hlsl_ir_expr(cast); } +struct hlsl_ir_expr *hlsl_new_copy(struct hlsl_ir_node *node) +{ + /* Use a cast to the same type as a makeshift identity expression. */ + return hlsl_new_cast(node, node->data_type, &node->loc); +} + struct hlsl_ir_var *hlsl_new_var(const char *name, struct hlsl_type *type, const struct vkd3d_shader_location loc, const char *semantic, unsigned int modifiers, const struct hlsl_reg_reservation *reg_reservation) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 5a2f6af..92ac527 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -525,6 +525,7 @@ struct hlsl_ir_node *hlsl_new_binary_expr(enum hlsl_ir_expr_op op, struct hlsl_i struct hlsl_ir_node *arg2) DECLSPEC_HIDDEN; struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, struct vkd3d_shader_location *loc) DECLSPEC_HIDDEN; +struct hlsl_ir_expr *hlsl_new_copy(struct hlsl_ir_node *node) DECLSPEC_HIDDEN; struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hlsl_type *return_type, struct list *parameters, const char *semantic, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_if *hlsl_new_if(struct hlsl_ir_node *condition, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6fceafb..afac0ab 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1336,9 +1336,8 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in /* Don't use the instruction itself as a source, as this makes structure * splitting easier. Instead copy it here. Since we retrieve sources from - * the last instruction in the list, we do need to copy. Use a cast - * instruction to the same type as a makeshift identity expression. */ - if (!(copy = hlsl_new_cast(rhs, rhs->data_type, &lhs->loc))) + * the last instruction in the list, we do need to copy. */ + if (!(copy = hlsl_new_copy(rhs))) return NULL; list_add_tail(instrs, ©->node.entry); return ©->node; @@ -1365,8 +1364,7 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem { struct hlsl_ir_expr *copy; - /* Use a cast to the same type as a makeshift identity expression. */ - if (!(copy = hlsl_new_cast(lhs, lhs->data_type, &lhs->loc))) + if (!(copy = hlsl_new_copy(lhs))) return false; list_add_tail(instrs, ©->node.entry);
1
0
0
0
← Newer
1
...
57
58
59
60
61
62
63
...
117
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
Results per page:
10
25
50
100
200