[PATCH vkd3d 1/5] vkd3d-shader/hlsl: Parse texture types.

[Chip Davis]

October 5, 2021 10:36 PM, "Zebediah Figura" <zfigura at codeweavers.com> wrote:

> @@ -734,8 +750,8 @@ 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->sampler_dim != t2->sampler_dim)
> -        return t1->sampler_dim - t2->sampler_dim;
> +    if ((t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE)
> +            && t1->sampler_dim != t2->sampler_dim)

This looks wrong. Did you intend to get rid of that subtraction?

>      if (t1->dimx != t2->dimx)
>          return t1->dimx - t2->dimx;
>      if (t1->dimy != t2->dimy)


Chip