ddraw/tests: Fix Android build by replacing log2f(x) with logf(x)/logf(2)
André Hentschel
nerv at dawncrow.de
Thu Mar 16 16:07:52 CDT 2017
Signed-off-by: André Hentschel <nerv at dawncrow.de>
---
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 4f53ee1..89ebf55 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -7511,7 +7511,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));
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 be950d8..39f02e3 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -8653,7 +8653,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));
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 2f92a70..d37c642 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -9558,7 +9558,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));
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 6a35cb8..9ca826b 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -9883,7 +9883,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));
g = (f + 1.0f) / 2.0f;
g -= (int)g;
expected_broken = (expected / exp2f(f) - g) * 256;
--
2.7.4
More information about the wine-patches
mailing list