[PATCH v2 0/1] MR247: tests: Cast abs() result to unsigned int in compare_float().

[Zebediah Figura (＠zfigura)]

--
  v2: tests: Use compare_uint() in compare_float().
 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/247

[PATCH v2 1/1] tests: Use compare_uint() in compare_float().

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

Comparing the result of abs() is broken in the case that x - y == INT_MIN.
---
 tests/d3d12_test_utils.h |  7 -------
 tests/utils.h            | 12 ++++++++----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h
index 19105e196..ec5ba5c57 100644
--- a/tests/d3d12_test_utils.h
+++ b/tests/d3d12_test_utils.h
@@ -74,13 +74,6 @@ static void set_viewport(D3D12_VIEWPORT *vp, float x, float y,
     vp->MaxDepth = max_depth;
 }
 
-static bool compare_uint(unsigned int x, unsigned int y, unsigned int max_diff)
-{
-    unsigned int diff = x > y ? x - y : y - x;
-
-    return diff <= max_diff;
-}
-
 static bool compare_color(DWORD c1, DWORD c2, BYTE max_diff)
 {
     return compare_uint(c1 & 0xff, c2 & 0xff, max_diff)
diff --git a/tests/utils.h b/tests/utils.h
index 5fd7b086e..670941905 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -82,6 +82,13 @@ static inline bool vkd3d_array_reserve(void **elements, size_t *capacity, size_t
     return true;
 }
 
+static bool compare_uint(unsigned int x, unsigned int y, unsigned int max_diff)
+{
+    unsigned int diff = x > y ? x - y : y - x;
+
+    return diff <= max_diff;
+}
+
 static bool compare_float(float f, float g, unsigned int ulps)
 {
     int x, y;
@@ -101,10 +108,7 @@ static bool compare_float(float f, float g, unsigned int ulps)
     if (y < 0)
         y = INT_MIN - y;
 
-    if (abs(x - y) > ulps)
-        return false;
-
-    return true;
+    return compare_uint(x, y, ulps);
 }
 
 static inline bool compare_uvec4(const struct uvec4 *v1, const struct uvec4 *v2)
-- 
GitLab

https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/247

[Zebediah Figura (＠zfigura)]

Ah yes, that's better. I knew there'd be something nicer. I've pushed a version that uses compare_uint().

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/247#note_36854

[PATCH v2 0/1] MR247: tests: Cast abs() result to unsigned int in compare_float(). - approved

[Francisco Casas (＠fcasas)]

This merge request was approved by Francisco Casas.
-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/247

[PATCH v2 0/1] MR247: tests: Cast abs() result to unsigned int in compare_float(). - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.
-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/247