Commit bd9e3dde authored by Chip Davis's avatar Chip Davis Committed by Alexandre Julliard

d3d11/tests: Use compare_uint() in a few more places.

parent 4b19ef0b
...@@ -1011,7 +1011,7 @@ static void check_readback_data_u8_(unsigned int line, struct resource_readback ...@@ -1011,7 +1011,7 @@ static void check_readback_data_u8_(unsigned int line, struct resource_readback
for (x = rect->left; x < rect->right; ++x) for (x = rect->left; x < rect->right; ++x)
{ {
value = get_readback_u8(rb, x, y, z); value = get_readback_u8(rb, x, y, z);
if (abs((int)value - (int)expected_value) > max_diff) if (!compare_uint(value, expected_value, max_diff))
goto done; goto done;
} }
} }
...@@ -1046,7 +1046,7 @@ static void check_readback_data_u16_(unsigned int line, struct resource_readback ...@@ -1046,7 +1046,7 @@ static void check_readback_data_u16_(unsigned int line, struct resource_readback
for (x = rect->left; x < rect->right; ++x) for (x = rect->left; x < rect->right; ++x)
{ {
value = get_readback_u16(rb, x, y, z); value = get_readback_u16(rb, x, y, z);
if (abs((int)value - (int)expected_value) > max_diff) if (!compare_uint(value, expected_value, max_diff))
goto done; goto done;
} }
} }
...@@ -1081,7 +1081,7 @@ static void check_readback_data_u24_(unsigned int line, struct resource_readback ...@@ -1081,7 +1081,7 @@ static void check_readback_data_u24_(unsigned int line, struct resource_readback
for (x = rect->left; x < rect->right; ++x) for (x = rect->left; x < rect->right; ++x)
{ {
value = get_readback_u32(rb, x, y, z) >> shift; value = get_readback_u32(rb, x, y, z) >> shift;
if (abs((int)value - (int)expected_value) > max_diff) if (!compare_uint(value, expected_value, max_diff))
goto done; goto done;
} }
} }
...@@ -25841,7 +25841,7 @@ static void test_depth_bias(void) ...@@ -25841,7 +25841,7 @@ static void test_depth_bias(void)
u32 = get_readback_data(&rb, 0, y, 0, sizeof(*u32)); u32 = get_readback_data(&rb, 0, y, 0, sizeof(*u32));
u32_value = *u32 >> shift; u32_value = *u32 >> shift;
expected_value = depth * 16777215.0f + 0.5f; expected_value = depth * 16777215.0f + 0.5f;
all_match = abs(u32_value - expected_value) <= 3; all_match = compare_uint(u32_value, expected_value, 3);
ok(all_match, ok(all_match,
"Got value %#x (%.8e), expected %#x (%.8e).\n", "Got value %#x (%.8e), expected %#x (%.8e).\n",
u32_value, u32_value / 16777215.0f, u32_value, u32_value / 16777215.0f,
...@@ -25850,7 +25850,7 @@ static void test_depth_bias(void) ...@@ -25850,7 +25850,7 @@ static void test_depth_bias(void)
case DXGI_FORMAT_D16_UNORM: case DXGI_FORMAT_D16_UNORM:
u16 = get_readback_data(&rb, 0, y, 0, sizeof(*u16)); u16 = get_readback_data(&rb, 0, y, 0, sizeof(*u16));
expected_value = depth * 65535.0f + 0.5f; expected_value = depth * 65535.0f + 0.5f;
all_match = abs(*u16 - expected_value) <= 1; all_match = compare_uint(*u16, expected_value, 1);
ok(all_match, ok(all_match,
"Got value %#x (%.8e), expected %#x (%.8e).\n", "Got value %#x (%.8e), expected %#x (%.8e).\n",
*u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment