aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/MathTest.cpp
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-09-09 20:09:12 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-09-09 20:09:12 +0000
commite0e7cfe44bb9d66d76120a79e5275c294bacaa22 (patch)
treed3d282beb8e498659f87abafa5a651946eea6ee8 /tests/MathTest.cpp
parent50b2e33dc6acaed906bfdc89af9b359ea2665c52 (diff)
Change old PRG to be SkLCGRandom; change new one to SkRandom
The goal here is to get people to start using the new random number generator, while leaving the old one in place so we don't have to rebaseline GMs. R=reed@google.com, bsalomon@google.com Author: jvanverth@google.com Review URL: https://chromiumcodereview.appspot.com/23576015 git-svn-id: http://skia.googlecode.com/svn/trunk@11169 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/MathTest.cpp')
-rw-r--r--tests/MathTest.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/MathTest.cpp b/tests/MathTest.cpp
index 5ec91a9e5b..cb4d0b8bd2 100644
--- a/tests/MathTest.cpp
+++ b/tests/MathTest.cpp
@@ -19,7 +19,7 @@ static void test_clz(skiatest::Reporter* reporter) {
REPORTER_ASSERT(reporter, 1 == SkCLZ(1 << 30));
REPORTER_ASSERT(reporter, 0 == SkCLZ(~0U));
- SkMWCRandom rand;
+ SkRandom rand;
for (int i = 0; i < 1000; ++i) {
uint32_t mask = rand.nextU();
// need to get some zeros for testing, but in some obscure way so the
@@ -82,7 +82,7 @@ static void test_muldivround(skiatest::Reporter* reporter) {
}
#endif
- SkMWCRandom rand;
+ SkRandom rand;
for (int i = 0; i < 10000; ++i) {
unsigned a = rand.nextU() & 0x7FFF;
unsigned b = rand.nextU() & 0x7FFF;
@@ -219,7 +219,7 @@ static void check_length(skiatest::Reporter* reporter,
REPORTER_ASSERT(reporter, len > 0.999f && len < 1.001f);
}
-static float nextFloat(SkMWCRandom& rand) {
+static float nextFloat(SkRandom& rand) {
SkFloatIntUnion data;
data.fSignBitInt = rand.nextU();
return data.fFloat;
@@ -293,7 +293,7 @@ static void test_int2float(skiatest::Reporter* reporter, int ival) {
}
static void unittest_fastfloat(skiatest::Reporter* reporter) {
- SkMWCRandom rand;
+ SkRandom rand;
size_t i;
static const float gFloats[] = {
@@ -414,7 +414,7 @@ static void test_copysign(skiatest::Reporter* reporter) {
REPORTER_ASSERT(reporter, sk_float_copysign(x, y) == expected);
}
- SkMWCRandom rand;
+ SkRandom rand;
for (int j = 0; j < 1000; j++) {
int ix = rand.nextS();
REPORTER_ASSERT(reporter, SkCopySign32(ix, ix) == ix);
@@ -433,7 +433,7 @@ static void test_copysign(skiatest::Reporter* reporter) {
static void TestMath(skiatest::Reporter* reporter) {
int i;
int32_t x;
- SkMWCRandom rand;
+ SkRandom rand;
// these should assert
#if 0