Module: wine Branch: master Commit: e7a2e45c703123b143324cf88e690ce0865a5790 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7a2e45c703123b143324cf88...
Author: Jacek Caban jacek@codeweavers.com Date: Fri Jan 24 11:08:23 2020 +0100
ddraw/tests: Don't use log2f to avoid mingwex dependency.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index d85d31343f..16c0cfb4e5 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -8205,7 +8205,7 @@ static void test_color_fill(void) float f, g;
expected = tests[i].result & mask; - f = ceilf(log2f(expected + 1.0f)); + f = ceilf(logf(expected + 1.0f) / logf(2.0f)); g = (f + 1.0f) / 2.0f; g -= (int)g; expected_broken = (expected / exp2f(f) - g) * 256; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 9ca6b44eb8..f0ae458d85 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -8953,7 +8953,7 @@ static void test_color_fill(void) float f, g;
expected = tests[i].result & mask; - f = ceilf(log2f(expected + 1.0f)); + f = ceilf(logf(expected + 1.0f) / logf(2.0f)); g = (f + 1.0f) / 2.0f; g -= (int)g; expected_broken = (expected / exp2f(f) - g) * 256; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 39b4aca657..7ce33ab406 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -10601,7 +10601,7 @@ static void test_color_fill(void) float f, g;
expected = tests[i].result & U3(z_fmt).dwZBitMask; - f = ceilf(log2f(expected + 1.0f)); + f = ceilf(logf(expected + 1.0f) / logf(2.0f)); g = (f + 1.0f) / 2.0f; g -= (int)g; expected_broken = (expected / exp2f(f) - g) * 256; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c34d939486..cde5d2b5ba 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -10575,7 +10575,7 @@ static void test_color_fill(void) float f, g;
expected = tests[i].result & U3(z_fmt).dwZBitMask; - f = ceilf(log2f(expected + 1.0f)); + f = ceilf(logf(expected + 1.0f) / logf(2.0f)); g = (f + 1.0f) / 2.0f; g -= (int)g; expected_broken = (expected / exp2f(f) - g) * 256;