Module: wine Branch: master Commit: b89f027bc148f6449647dd2a0518ccb2a3d6ed0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b89f027bc148f6449647dd2a0...
Author: Zebediah Figura zfigura@codeweavers.com Date: Mon Aug 12 10:27:29 2019 -0500
d3dcompiler: Use new_cast() in implicit_conversion().
Signed-off-by: Zebediah Figura zfigura@codeweavers.com Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3dcompiler_43/utils.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 742b262..1dbb915 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1277,19 +1277,10 @@ static struct hlsl_type *expr_common_type(struct hlsl_type *t1, struct hlsl_type static struct hlsl_ir_node *implicit_conversion(struct hlsl_ir_node *node, struct hlsl_type *type, struct source_location *loc) { - struct hlsl_ir_expr *cast; - struct hlsl_ir_node *operands[3]; - if (compare_hlsl_types(node->data_type, type)) return node; TRACE("Implicit conversion of expression to %s\n", debug_hlsl_type(type)); - operands[0] = node; - operands[1] = operands[2] = NULL; - cast = new_expr(HLSL_IR_UNOP_CAST, operands, loc); - if (!cast) - return NULL; - cast->node.data_type = type; - return &cast->node; + return &new_cast(node, type, loc)->node; }
struct hlsl_ir_expr *new_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node **operands,