Zebediah Figura : d3dcompiler: Use the cached scalar type in expr_common_type() where possible.
Alexandre Julliard
julliard at winehq.org
Thu Jun 11 15:26:47 CDT 2020
Module: wine
Branch: master
Commit: 9c985e703b2c4a49b81bb692ac31b6414417a38e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c985e703b2c4a49b81bb692ac31b6414417a38e
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Mon Jun 8 16:49:34 2020 -0500
d3dcompiler: Use the cached scalar type in expr_common_type() where possible.
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3dcompiler_43/utils.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c
index ec0da2d403..97e3cdf1a3 100644
--- a/dlls/d3dcompiler_43/utils.c
+++ b/dlls/d3dcompiler_43/utils.c
@@ -1294,6 +1294,8 @@ static struct hlsl_type *expr_common_type(struct hlsl_type *t1, struct hlsl_type
}
}
+ if (type == HLSL_CLASS_SCALAR)
+ return hlsl_ctx.builtin_types.scalar[base];
return new_hlsl_type(NULL, type, base, dimx, dimy);
}
More information about the wine-cvs
mailing list