[PATCH vkd3d v5 1/6] vkd3d-shader/hlsl: Fix wrong conditional in compare_param_hlsl_types().

Giovanni Mascellani gmascellani at codeweavers.com
Fri Jan 28 02:24:49 CST 2022


Signed-off-by: Giovanni Mascellani <gmascellani at codeweavers.com>

Il 27/01/22 19:31, Francisco Casas ha scritto:
> Signed-off-by: Francisco Casas <fcasas at codeweavers.com>
> ---
>   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 917c7bf7..e96969d1 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;



More information about the wine-devel mailing list