Change old PRG to be SkLCGRandom; change new one to SkRandom

bench/MatrixBench.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkBenchmark.h"
 #include "SkMatrix.h"
 #include "SkMatrixUtils.h"
@@ skipping 77 matching lines @@
 private:
     SkMatrix fM0, fM1, fM2;
     SkScalar fSX, fSY;
     typedef MatrixBench INHERITED;
 };
 
 // having unknown values in our arrays can throw off the timing a lot, perhaps
 // handling NaN values is a lot slower. Anyway, this guy is just meant to put
 // reasonable values in our arrays.
 template <typename T> void init9(T array[9]) {
-    SkMWCRandom rand;
+    SkRandom rand;
     for (int i = 0; i < 9; i++) {
         array[i] = rand.nextSScalar1();
     }
 }
 
 // Test the performance of setConcat() non-perspective case:
 // using floating point precision only.
 class FloatConcatMatrixBench : public MatrixBench {
 public:
     FloatConcatMatrixBench(void* p) : INHERITED(p, "concat_floatfloat") {
@@ skipping 145 matching lines @@
         fMatrix.dirtyMatrixTypeCache();
         always_do(fMatrix.getType());
         fMatrix.dirtyMatrixTypeCache();
         always_do(fMatrix.getType());
         fMatrix.dirtyMatrixTypeCache();
         always_do(fMatrix.getType());
     }
 private:
     SkMatrix fMatrix;
     float fArray[9];
-    SkMWCRandom fRnd;
+    SkRandom fRnd;
     typedef MatrixBench INHERITED;
 };
 
 class ScaleTransMixedMatrixBench : public MatrixBench {
  public:
     ScaleTransMixedMatrixBench(void* p) : INHERITED(p, "scaletrans_mixed") {
         fMatrix.setAll(fRandom.nextSScalar1(), fRandom.nextSScalar1(), fRandom.nextSScalar1(),
                        fRandom.nextSScalar1(), fRandom.nextSScalar1(), fRandom.nextSScalar1(),
                        fRandom.nextSScalar1(), fRandom.nextSScalar1(), fRandom.nextSScalar1());
         int i;
@@ skipping 20 matching lines @@
             dst += 1;
         } while (--count);
     }
  private:
     enum {
         kCount = SkBENCHLOOP(16)
     };
     SkMatrix fMatrix;
     SkPoint fSrc [16];
     SkPoint fDst [16];
-    SkMWCRandom fRandom;
+    SkRandom fRandom;
     typedef MatrixBench INHERITED;
 };
 
 class ScaleTransDoubleMatrixBench : public MatrixBench {
  public:
     ScaleTransDoubleMatrixBench(void* p) : INHERITED(p, "scaletrans_double") {
         init9(fMatrix);
         int i;
         for (i = 0; i < kCount; i++) {
             fSrc[i].fX = fRandom.nextSScalar1();
@@ skipping 19 matching lines @@
             dst += 1;
         } while (--count);
     }
  private:
     enum {
         kCount = SkBENCHLOOP(16)
     };
     double fMatrix [9];
     SkPoint fSrc [16];
     SkPoint fDst [16];
-    SkMWCRandom fRandom;
+    SkRandom fRandom;
     typedef MatrixBench INHERITED;
 };
 
 class DecomposeMatrixBench : public MatrixBench {
 public:
     DecomposeMatrixBench(void* param) : INHERITED(param, "decompose") {}
 
 protected:
     virtual void onPreDraw() {
         for (int i = 0; i < 10; ++i) {
             SkScalar rot0 = (fRandom.nextBool()) ? fRandom.nextRangeF(-180, 180) : 0.0f;
             SkScalar sx = fRandom.nextRangeF(-3000.f, 3000.f);
             SkScalar sy = (fRandom.nextBool()) ? fRandom.nextRangeF(-3000.f, 3000.f) : sx;
             SkScalar rot1 = fRandom.nextRangeF(-180, 180);
             fMatrix[i].setRotate(rot0);
             fMatrix[i].postScale(sx, sy);
             fMatrix[i].postRotate(rot1);
         }
     }
     virtual void performTest() {
         SkPoint rotation1, scale, rotation2;
         for (int i = 0; i < 10; ++i) {
             (void) SkDecomposeUpper2x2(fMatrix[i], &rotation1, &scale, &rotation2);
         }
     }
 private:
     SkMatrix fMatrix[10];
-    SkMWCRandom fRandom;
+    SkRandom fRandom;
     typedef MatrixBench INHERITED;
 };
 
 class InvertMapRectMatrixBench : public MatrixBench {
 public:
     InvertMapRectMatrixBench(void* param, const char* name, int flags)
         : INHERITED(param, name)
         , fFlags(flags) {
         fMatrix.reset();
         fIteration = 0;
@@ skipping 84 matching lines @@
 
 DEF_BENCH( return new InvertMapRectMatrixBench(p,
                            "invert_maprect_typemask_nonpersp",
                            InvertMapRectMatrixBench::kUncachedTypeMask_Flag |
                            InvertMapRectMatrixBench::kScale_Flag |
                            InvertMapRectMatrixBench::kRotate_Flag |
                            InvertMapRectMatrixBench::kTranslate_Flag); )
 
 DEF_BENCH( return new ScaleTransMixedMatrixBench(p); )
 DEF_BENCH( return new ScaleTransDoubleMatrixBench(p); )