Module: vkd3d Branch: master Commit: f5f9cddda238cfe151f1b98f3ce800ba029e7681 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f5f9cddda238cfe151f1b98f...
Author: Francisco Casas fcasas@codeweavers.com Date: Thu Jan 27 15:31:21 2022 -0300
vkd3d-shader/hlsl: Fix wrong conditional in compare_param_hlsl_types().
Signed-off-by: Francisco Casas fcasas@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Zebediah Figura zfigura@codeweavers.com Signed-off-by: Giovanni Mascellani gmascellani@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
libs/vkd3d-shader/hlsl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 917c7bf..e96969d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -794,8 +794,7 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls } if (t1->base_type != t2->base_type) return t1->base_type - t2->base_type; - if ((t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) - && t1->sampler_dim != t2->sampler_dim) + if (t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) { if (t1->sampler_dim != t2->sampler_dim) return t1->sampler_dim - t2->sampler_dim;