Module: vkd3d Branch: master Commit: b8502ed51cc6ab161e97214ba86c231a51eca6e2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b8502ed51cc6ab161e97214b...
Author: Zebediah Figura zfigura@codeweavers.com Date: Mon Sep 27 20:51:45 2021 -0500
vkd3d-shader/hlsl: Use cached vector types in more places.
Signed-off-by: Zebediah Figura zfigura@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Giovanni Mascellani gmascellani@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/hlsl.y | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 932593f..14ad90c 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -608,7 +608,7 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned if (!(swizzle = hlsl_alloc(ctx, sizeof(*swizzle)))) return NULL; init_node(&swizzle->node, HLSL_IR_SWIZZLE, - hlsl_new_type(ctx, NULL, HLSL_CLASS_VECTOR, val->data_type->base_type, components, 1), *loc); + ctx->builtin_types.vector[val->data_type->base_type][components - 1], *loc); hlsl_src_from_node(&swizzle->val, val); swizzle->swizzle = s; return swizzle; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2a38470..5c10659 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2397,7 +2397,7 @@ type: YYABORT; }
- $$ = hlsl_new_type(ctx, NULL, HLSL_CLASS_VECTOR, $3->base_type, $5, 1); + $$ = ctx->builtin_types.vector[$3->base_type][$5 - 1]; } | KW_MATRIX '<' type ',' C_INTEGER ',' C_INTEGER '>' {