wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_mul().

Browse Source
This commit is contained in:
Zebediah Figura 2022-11-11 18:48:13 -06:00 committed by Alexandre Julliard
parent 623cd94997
commit d565caafb5
Notes: Alexandre Julliard 2023-05-23 23:13:26 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/205
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/vkd3d-shader/hlsl_constant_ops.c
View File

@ -222,10 +222,10 @@ static bool fold_add(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons
return true; return true;
} }
static bool fold_mul(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, static bool fold_mul(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type,
struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2)
{ {
enum hlsl_base_type type = dst->node.data_type->base_type; enum hlsl_base_type type = dst_type->base_type;
unsigned int k; unsigned int k;
assert(type == src1->node.data_type->base_type); assert(type == src1->node.data_type->base_type);
@ -237,20 +237,20 @@ static bool fold_mul(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst,
{ {
case HLSL_TYPE_FLOAT: case HLSL_TYPE_FLOAT:
case HLSL_TYPE_HALF: case HLSL_TYPE_HALF:
dst->value.u[k].f = src1->value.u[k].f * src2->value.u[k].f; dst->u[k].f = src1->value.u[k].f * src2->value.u[k].f;
break; break;
case HLSL_TYPE_DOUBLE: case HLSL_TYPE_DOUBLE:
dst->value.u[k].d = src1->value.u[k].d * src2->value.u[k].d; dst->u[k].d = src1->value.u[k].d * src2->value.u[k].d;
break; break;
case HLSL_TYPE_INT: case HLSL_TYPE_INT:
case HLSL_TYPE_UINT: case HLSL_TYPE_UINT:
dst->value.u[k].u = src1->value.u[k].u * src2->value.u[k].u; dst->u[k].u = src1->value.u[k].u * src2->value.u[k].u;
break; break;
default: default:
FIXME("Fold multiplication for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); FIXME("Fold multiplication for type %s.\n", debug_hlsl_type(ctx, dst_type));
return false; return false;
} }
} }
@ -592,7 +592,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr,
break; break;
case HLSL_OP2_MUL: case HLSL_OP2_MUL:
success = fold_mul(ctx, res, arg1, arg2); success = fold_mul(ctx, &res->value, instr->data_type, arg1, arg2);
break; break;
case HLSL_OP2_NEQUAL: case HLSL_OP2_NEQUAL: