[PATCH vkd3d v3 06/12] vkd3d-shader/hlsl: Fix wrong conditional in compare_param_hlsl_types().
Francisco Casas
fcasas at codeweavers.com
Fri Dec 17 13:12:48 CST 2021
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 82820daf..c664d5b1 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -791,8 +791,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;
--
2.25.1
More information about the wine-devel
mailing list