Adding new bench tests for lighting and blur

bench/LightingBench.cpp

+/*
+ * Copyright 2013 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 "SkBitmapSource.h"
+#include "SkCanvas.h"
+#include "SkDevice.h"
+#include "SkLightingImageFilter.h"
+
+#define FILTER_WIDTH_SMALL  SkIntToScalar(32)
+#define FILTER_HEIGHT_SMALL SkIntToScalar(32)
+#define FILTER_WIDTH_LARGE  SkIntToScalar(256)
+#define FILTER_HEIGHT_LARGE SkIntToScalar(256)
+
+class LightingBaseBench : public SkBenchmark {
+public:
+    LightingBaseBench(void* param, bool small) : INHERITED(param), fIsSmall(small) {
+    }
+
+protected:
+    SkRect getFilterRect() const {
+        return fIsSmall ? SkRect::MakeWH(FILTER_WIDTH_SMALL, FILTER_HEIGHT_SMALL) :
+                          SkRect::MakeWH(FILTER_WIDTH_LARGE, FILTER_HEIGHT_LARGE);
+    }
+
+    bool fIsSmall;
+    typedef SkBenchmark INHERITED;
+};
+
+class LightingPointLitDiffuseBench : public LightingBaseBench {
+public:
+    LightingPointLitDiffuseBench(void* param, bool small) : INHERITED(param, small) {
+    }
+
+protected:
+    virtual const char* onGetName() SK_OVERRIDE {
+        return fIsSmall ? "lightingpointlitdiffuse_small" : "lightingpointlitdiffuse_large";
+    }
+
+    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+        SkRect r = getFilterRect();
+
+        SkPoint3 pointLocation(0, 0, SkIntToScalar(10));
+        SkScalar kd = SkIntToScalar(2);
+        SkScalar surfaceScale = SkIntToScalar(1);
+        SkColor white(0xFFFFFFFF);
+
+        SkPaint paint;
+        paint.setImageFilter(SkLightingImageFilter::CreatePointLitDiffuse(
+            pointLocation, white, surfaceScale, kd))->unref();
+        canvas->drawRect(r, paint);
+    }
+
+private:
+    typedef LightingBaseBench INHERITED;
+};
+
+class LightingDistantLitDiffuseBench : public LightingBaseBench {
+public:
+    LightingDistantLitDiffuseBench(void* param, bool small) : INHERITED(param, small) {
+    }
+
+protected:
+    virtual const char* onGetName() SK_OVERRIDE {
+        return fIsSmall ? "lightingdistantlitdiffuse_small" : "lightingdistantlitdiffuse_large";
+    }
+
+    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+        SkRect r = getFilterRect();
+
+        SkScalar azimuthRad = SkDegreesToRadians(SkIntToScalar(225));
+        SkScalar elevationRad = SkDegreesToRadians(SkIntToScalar(5));
+        SkPoint3 distantDirection(SkScalarMul(SkScalarCos(azimuthRad), SkScalarCos(elevationRad)),
+                                  SkScalarMul(SkScalarSin(azimuthRad), SkScalarCos(elevationRad)),
+                                  SkScalarSin(elevationRad));
+        SkScalar kd = SkIntToScalar(2);
+        SkScalar surfaceScale = SkIntToScalar(1);
+        SkColor white(0xFFFFFFFF);
+
+        SkPaint paint;
+        paint.setImageFilter(SkLightingImageFilter::CreateDistantLitDiffuse(
+            distantDirection, white, surfaceScale, kd))->unref();
+        canvas->drawRect(r, paint);
+    }
+
+private:
+    typedef LightingBaseBench INHERITED;
+};
+
+class LightingSpotLitDiffuseBench : public LightingBaseBench {
+public:
+    LightingSpotLitDiffuseBench(void* param, bool small) : INHERITED(param, small) {
+    }
+
+protected:
+    virtual const char* onGetName() SK_OVERRIDE {
+        return fIsSmall ? "lightingspotlitdiffuse_small" : "lightingspotlitdiffuse_large";
+    }
+
+    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+        SkRect r = getFilterRect();
+
+        SkPoint3 spotLocation(SkIntToScalar(-10), SkIntToScalar(-10), SkIntToScalar(20));
+        SkPoint3 spotTarget(SkIntToScalar(40), SkIntToScalar(40), 0);
+        SkScalar spotExponent = SK_Scalar1;
+        SkScalar cutoffAngle = SkIntToScalar(15);
+        SkScalar kd = SkIntToScalar(2);
+        SkScalar surfaceScale = SkIntToScalar(1);
+        SkColor white(0xFFFFFFFF);
+
+        SkPaint paint;
+        paint.setImageFilter(SkLightingImageFilter::CreateSpotLitDiffuse(spotLocation,
+            spotTarget, spotExponent, cutoffAngle, white, surfaceScale, kd))->unref();
+        canvas->drawRect(r, paint);
+    }
+
+private:
+    typedef LightingBaseBench INHERITED;
+};
+
+class LightingPointLitSpecularBench : public LightingBaseBench {
+public:
+    LightingPointLitSpecularBench(void* param, bool small) : INHERITED(param, small) {
+    }
+
+protected:
+    virtual const char* onGetName() SK_OVERRIDE {
+        return fIsSmall ? "lightingpointlitspecular_small" : "lightingpointlitspecular_large";
+    }
+
+    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+        SkRect r = getFilterRect();
+
+        SkPoint3 pointLocation(0, 0, SkIntToScalar(10));
+        SkScalar ks = SkIntToScalar(1);
+        SkScalar shininess = SkIntToScalar(8);
+        SkScalar surfaceScale = SkIntToScalar(1);
+        SkColor white(0xFFFFFFFF);
+
+        SkPaint paint;
+        paint.setImageFilter(SkLightingImageFilter::CreatePointLitSpecular(
+            pointLocation, white, surfaceScale, ks, shininess))->unref();
+        canvas->drawRect(r, paint);
+    }
+
+private:
+    typedef LightingBaseBench INHERITED;
+};
+
+class LightingDistantLitSpecularBench : public LightingBaseBench {
+public:
+    LightingDistantLitSpecularBench(void* param, bool small) : INHERITED(param, small) {
+    }
+
+protected:
+    virtual const char* onGetName() SK_OVERRIDE {
+        return fIsSmall ? "lightingdistantlitspecular_small" : "lightingdistantlitspecular_large";
+    }
+
+    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+        SkRect r = getFilterRect();
+
+        SkScalar azimuthRad = SkDegreesToRadians(SkIntToScalar(225));

[Stephen White, 2013/04/24 17:35:56]

Nit:  looks like there are lots of opportunities for code sharing here with the
Diffuse benches.  You can do that in a followup patch if you like.

[sugoi1, 2013/04/24 18:49:10]

Done. I made some base class functionality to reduce code duplication.

+        SkScalar elevationRad = SkDegreesToRadians(SkIntToScalar(5));
+        SkPoint3 distantDirection(SkScalarMul(SkScalarCos(azimuthRad), SkScalarCos(elevationRad)),
+                                  SkScalarMul(SkScalarSin(azimuthRad), SkScalarCos(elevationRad)),
+                                  SkScalarSin(elevationRad));
+        SkScalar ks = SkIntToScalar(1);
+        SkScalar shininess = SkIntToScalar(8);
+        SkScalar surfaceScale = SkIntToScalar(1);
+        SkColor white(0xFFFFFFFF);
+
+        SkPaint paint;
+        paint.setImageFilter(SkLightingImageFilter::CreateDistantLitSpecular(
+            distantDirection, white, surfaceScale, ks, shininess))->unref();
+        canvas->drawRect(r, paint);
+    }
+
+private:
+    typedef LightingBaseBench INHERITED;
+};
+
+class LightingSpotLitSpecularBench : public LightingBaseBench {
+public:
+    LightingSpotLitSpecularBench(void* param, bool small) : INHERITED(param, small) {
+    }
+
+protected:
+    virtual const char* onGetName() SK_OVERRIDE {
+        return fIsSmall ? "lightingspotlitspecular_small" : "lightingspotlitspecular_large";
+    }
+
+    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+        SkRect r = getFilterRect();
+
+        SkPoint3 spotLocation(SkIntToScalar(-10), SkIntToScalar(-10), SkIntToScalar(20));
+        SkPoint3 spotTarget(SkIntToScalar(40), SkIntToScalar(40), 0);
+        SkScalar spotExponent = SK_Scalar1;
+        SkScalar cutoffAngle = SkIntToScalar(15);
+        SkScalar ks = SkIntToScalar(1);
+        SkScalar shininess = SkIntToScalar(8);
+        SkScalar surfaceScale = SkIntToScalar(1);
+        SkColor white(0xFFFFFFFF);
+
+        SkPaint paint;
+        paint.setImageFilter(SkLightingImageFilter::CreateSpotLitSpecular(spotLocation,
+            spotTarget, spotExponent, cutoffAngle, white, surfaceScale, ks, shininess))->unref();
+        canvas->drawRect(r, paint);
+    }
+
+private:
+    typedef LightingBaseBench INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+DEF_BENCH( return new LightingPointLitDiffuseBench(p, true); )
+DEF_BENCH( return new LightingPointLitDiffuseBench(p, false); )
+DEF_BENCH( return new LightingDistantLitDiffuseBench(p, true); )
+DEF_BENCH( return new LightingDistantLitDiffuseBench(p, false); )
+DEF_BENCH( return new LightingSpotLitDiffuseBench(p, true); )
+DEF_BENCH( return new LightingSpotLitDiffuseBench(p, false); )
+DEF_BENCH( return new LightingPointLitSpecularBench(p, true); )
+DEF_BENCH( return new LightingPointLitSpecularBench(p, false); )
+DEF_BENCH( return new LightingDistantLitSpecularBench(p, true); )
+DEF_BENCH( return new LightingDistantLitSpecularBench(p, false); )
+DEF_BENCH( return new LightingSpotLitSpecularBench(p, true); )
+DEF_BENCH( return new LightingSpotLitSpecularBench(p, false); )
+