Henri Verbeet : vkd3d-shader/hlsl: Properly compare integers in compare_param_hlsl_types().

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 790ab754d5ac4fb1a723e16b22dbeea1a52a12b8
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=790ab754d5ac4fb1a723e16b...

Author: Henri Verbeet 
Date:   Mon Feb 28 12:23:48 2022 +0100

vkd3d-shader/hlsl: Properly compare integers in compare_param_hlsl_types().

As pointed out by Giovanni Mascellani, modular subtraction doesn't produce a
total order; in particular, it's not transitive. The nature of the types being
compared here makes it unlikely this will be an issue in practice, but it's
both fragile and setting a poor example.

Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

include/private/vkd3d_common.h |  5 +++++
 libs/vkd3d-shader/hlsl.c       | 24 ++++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h
index 1e19758..ac55685 100644
--- a/include/private/vkd3d_common.h
+++ b/include/private/vkd3d_common.h
@@ -158,6 +158,11 @@ static inline uint32_t vkd3d_make_u32(uint16_t low, uint16_t high)
     return low | ((uint32_t)high << 16);
 }

+static inline int vkd3d_u32_compare(uint32_t x, uint32_t y)
+{
+    return (x > y) - (x < y);
+}
+
 static inline int ascii_isupper(int c)
 {
     return 'A' <= c && c <= 'Z';
diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index 8197fa9..689b9da 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -786,26 +786,26 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls
 {
     int r;

-    if (t1->type != t2->type)
+    if ((r = vkd3d_u32_compare(t1->type, t2->type)))
     {
         if (!((t1->type == HLSL_CLASS_SCALAR && t2->type == HLSL_CLASS_VECTOR)
                 || (t1->type == HLSL_CLASS_VECTOR && t2->type == HLSL_CLASS_SCALAR)))
-            return t1->type - t2->type;
+            return r;
     }
-    if (t1->base_type != t2->base_type)
-        return t1->base_type - t2->base_type;
+    if ((r = vkd3d_u32_compare(t1->base_type, t2->base_type)))
+        return r;
     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;
+        if ((r = vkd3d_u32_compare(t1->sampler_dim, t2->sampler_dim)))
+            return r;
         if (t1->base_type == HLSL_TYPE_TEXTURE && t1->sampler_dim != HLSL_SAMPLER_DIM_GENERIC
                 && (r = compare_param_hlsl_types(t1->e.resource_format, t2->e.resource_format)))
             return r;
     }
-    if (t1->dimx != t2->dimx)
-        return t1->dimx - t2->dimx;
-    if (t1->dimy != t2->dimy)
-        return t1->dimx - t2->dimx;
+    if ((r = vkd3d_u32_compare(t1->dimx, t2->dimx)))
+        return r;
+    if ((r = vkd3d_u32_compare(t1->dimy, t2->dimy)))
+        return r;
     if (t1->type == HLSL_CLASS_STRUCT)
     {
         struct list *t1cur, *t2cur;
@@ -830,8 +830,8 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls
     }
     if (t1->type == HLSL_CLASS_ARRAY)
     {
-        if (t1->e.array.elements_count != t2->e.array.elements_count)
-            return t1->e.array.elements_count - t2->e.array.elements_count;
+        if ((r = vkd3d_u32_compare(t1->e.array.elements_count, t2->e.array.elements_count)))
+            return r;
         return compare_param_hlsl_types(t1->e.array.type, t2->e.array.type);
     }