A bunch of little SkMScalar-as-float build fixes.

bench/Matrix44Bench.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Benchmark.h"
 #include "SkMatrix44.h"
 #include "SkRandom.h"
@@ skipping 98 matching lines @@
     typedef Matrix44Bench INHERITED;
 };
 
 class InvertMatrix44Bench : public Matrix44Bench {
 public:
     InvertMatrix44Bench()
         : INHERITED("invert")
         , fM0(SkMatrix44::kUninitialized_Constructor)
         , fM1(SkMatrix44::kUninitialized_Constructor)
     {
-        fM0.set(0, 0, -1.1);
-        fM0.set(0, 1, 2.1);
-        fM0.set(0, 2, -3.1);
-        fM0.set(0, 3, 4.1);
-        fM0.set(1, 0, 5.1);
-        fM0.set(1, 1, -6.1);
-        fM0.set(1, 2, 7.1);
-        fM0.set(1, 3, 8.1);
-        fM0.set(2, 0, -9.1);
-        fM0.set(2, 1, 10.1);
-        fM0.set(2, 2, 11.1);
-        fM0.set(2, 3, -12.1);
-        fM0.set(3, 0, -13.1);
-        fM0.set(3, 1, 14.1);
-        fM0.set(3, 2, -15.1);
-        fM0.set(3, 3, 16.1);
+        fM0.setDouble(0, 0, -1.1);
+        fM0.setDouble(0, 1, 2.1);
+        fM0.setDouble(0, 2, -3.1);
+        fM0.setDouble(0, 3, 4.1);
+        fM0.setDouble(1, 0, 5.1);
+        fM0.setDouble(1, 1, -6.1);
+        fM0.setDouble(1, 2, 7.1);
+        fM0.setDouble(1, 3, 8.1);
+        fM0.setDouble(2, 0, -9.1);
+        fM0.setDouble(2, 1, 10.1);
+        fM0.setDouble(2, 2, 11.1);
+        fM0.setDouble(2, 3, -12.1);
+        fM0.setDouble(3, 0, -13.1);
+        fM0.setDouble(3, 1, 14.1);
+        fM0.setDouble(3, 2, -15.1);
+        fM0.setDouble(3, 3, 16.1);
     }
 protected:
     virtual void performTest() {
         for (int i = 0; i < 10; ++i) {
             fM0.invert(&fM1);
         }
     }
 private:
     SkMatrix44 fM0, fM1;
     typedef Matrix44Bench INHERITED;
 };
 
 class InvertAffineMatrix44Bench : public Matrix44Bench {
 public:
     InvertAffineMatrix44Bench()
         : INHERITED("invertaffine")
         , fM0(SkMatrix44::kIdentity_Constructor)
         , fM1(SkMatrix44::kUninitialized_Constructor)
     {
-        fM0.set(0, 0, -1.1);
-        fM0.set(0, 1, 2.1);
-        fM0.set(0, 2, -3.1);
-        fM0.set(0, 3, 4.1);
-        fM0.set(1, 0, 5.1);
-        fM0.set(1, 1, -6.1);
-        fM0.set(1, 2, 7.1);
-        fM0.set(1, 3, 8.1);
-        fM0.set(2, 0, -9.1);
-        fM0.set(2, 1, 10.1);
-        fM0.set(2, 2, 11.1);
-        fM0.set(2, 3, -12.1);
+        fM0.setDouble(0, 0, -1.1);
+        fM0.setDouble(0, 1, 2.1);
+        fM0.setDouble(0, 2, -3.1);
+        fM0.setDouble(0, 3, 4.1);
+        fM0.setDouble(1, 0, 5.1);
+        fM0.setDouble(1, 1, -6.1);
+        fM0.setDouble(1, 2, 7.1);
+        fM0.setDouble(1, 3, 8.1);
+        fM0.setDouble(2, 0, -9.1);
+        fM0.setDouble(2, 1, 10.1);
+        fM0.setDouble(2, 2, 11.1);
+        fM0.setDouble(2, 3, -12.1);
         // bottom row (perspective component) remains (0, 0, 0, 1).
     }
 protected:
     virtual void performTest() {
         for (int i = 0; i < 10; ++i) {
             fM0.invert(&fM1);
         }
     }
 private:
     SkMatrix44 fM0, fM1;
     typedef Matrix44Bench INHERITED;
 };
 
 class InvertScaleTranslateMatrix44Bench : public Matrix44Bench {
 public:
     InvertScaleTranslateMatrix44Bench()
         : INHERITED("invertscaletranslate")
         , fM0(SkMatrix44::kIdentity_Constructor)
         , fM1(SkMatrix44::kUninitialized_Constructor)
     {
-        fM0.set(0, 0, -1.1);
-        fM0.set(0, 3, 4.1);
+        fM0.setDouble(0, 0, -1.1);
+        fM0.setDouble(0, 3, 4.1);
 
-        fM0.set(1, 1, -6.1);
-        fM0.set(1, 3, 8.1);
+        fM0.setDouble(1, 1, -6.1);
+        fM0.setDouble(1, 3, 8.1);
 
-        fM0.set(2, 2, 11.1);
-        fM0.set(2, 3, -12.1);
+        fM0.setDouble(2, 2, 11.1);
+        fM0.setDouble(2, 3, -12.1);
     }
 protected:
     virtual void performTest() {
         for (int i = 0; i < 10; ++i) {
             fM0.invert(&fM1);
         }
     }
 private:
     SkMatrix44 fM0, fM1;
     typedef Matrix44Bench INHERITED;
 };
 
 class InvertTranslateMatrix44Bench : public Matrix44Bench {
 public:
     InvertTranslateMatrix44Bench()
         : INHERITED("inverttranslate")
         , fM0(SkMatrix44::kIdentity_Constructor)
         , fM1(SkMatrix44::kUninitialized_Constructor)
     {
-        fM0.set(0, 3, 4.1);
-        fM0.set(1, 3, 8.1);
-        fM0.set(2, 3, -12.1);
+        fM0.setDouble(0, 3, 4.1);
+        fM0.setDouble(1, 3, 8.1);
+        fM0.setDouble(2, 3, -12.1);
     }
 protected:
     virtual void performTest() {
         for (int i = 0; i < 10; ++i) {
             fM0.invert(&fM1);
         }
     }
 private:
     SkMatrix44 fM0, fM1;
     typedef Matrix44Bench INHERITED;
@@ skipping 79 matching lines @@
 DEF_BENCH( return new EqualsMatrix44Bench(); )
 DEF_BENCH( return new PreScaleMatrix44Bench(); )
 DEF_BENCH( return new PostScaleMatrix44Bench(); )
 DEF_BENCH( return new InvertMatrix44Bench(); )
 DEF_BENCH( return new InvertAffineMatrix44Bench(); )
 DEF_BENCH( return new InvertScaleTranslateMatrix44Bench(); )
 DEF_BENCH( return new InvertTranslateMatrix44Bench(); )
 DEF_BENCH( return new SetConcatMatrix44Bench(true); )
 DEF_BENCH( return new SetConcatMatrix44Bench(false); )
 DEF_BENCH( return new GetTypeMatrix44Bench(); )