diff options
author | sugoi@google.com <sugoi@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-17 13:46:56 +0000 |
---|---|---|
committer | sugoi@google.com <sugoi@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-17 13:46:56 +0000 |
commit | 4775cba7b37e24e8480bd2d96e297fd0828fb5c3 (patch) | |
tree | 16cd1aa26af814864aeb706f64fa0c8f20b4e701 /bench | |
parent | d61ba6e5cf2c574cbbf23de58239a30fe52228a2 (diff) |
Perlin noise adjustments
1 ) Added GPU simplex noise as a comparison to GPU Perlin noise. It can be enabled simply by using a #define (SK_USE_SIMPLEX_NOISE)
2 ) Enabled GPU Perlin noise tests
3 ) Added a small benchmark for noise
4 ) Disabled GPU Perlin noise on Android based on benchmarks
Review URL: https://codereview.chromium.org/14087002
git-svn-id: http://skia.googlecode.com/svn/trunk@8719 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'bench')
-rw-r--r-- | bench/PerlinNoiseBench.cpp | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/bench/PerlinNoiseBench.cpp b/bench/PerlinNoiseBench.cpp new file mode 100644 index 0000000000..3275302d6a --- /dev/null +++ b/bench/PerlinNoiseBench.cpp @@ -0,0 +1,60 @@ +/* + * 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 "SkCanvas.h" +#include "SkPerlinNoiseShader.h" + +class PerlinNoiseBench : public SkBenchmark { + SkISize fSize; + +public: + PerlinNoiseBench(void* param) : INHERITED(param) { + fSize = SkISize::Make(80, 80); + } + +protected: + virtual const char* onGetName() SK_OVERRIDE { + return "perlinnoise"; + } + + virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + this->test(canvas, 0, 0, SkPerlinNoiseShader::kFractalNoise_Type, + 0.1f, 0.1f, 3, 0, false); + } + +private: + void drawClippedRect(SkCanvas* canvas, int x, int y, const SkPaint& paint) { + canvas->save(); + canvas->clipRect(SkRect::MakeXYWH(SkIntToScalar(x), SkIntToScalar(y), + SkIntToScalar(fSize.width()), SkIntToScalar(fSize.height()))); + SkRect r = SkRect::MakeXYWH(SkIntToScalar(x), SkIntToScalar(y), + SkIntToScalar(fSize.width()), + SkIntToScalar(fSize.height())); + canvas->drawRect(r, paint); + canvas->restore(); + } + + void test(SkCanvas* canvas, int x, int y, SkPerlinNoiseShader::Type type, + float baseFrequencyX, float baseFrequencyY, int numOctaves, float seed, + bool stitchTiles) { + SkShader* shader = (type == SkPerlinNoiseShader::kFractalNoise_Type) ? + SkPerlinNoiseShader::CreateFractalNoise(baseFrequencyX, baseFrequencyY, numOctaves, + seed, stitchTiles ? &fSize : NULL) : + SkPerlinNoiseShader::CreateTubulence(baseFrequencyX, baseFrequencyY, numOctaves, + seed, stitchTiles ? &fSize : NULL); + SkPaint paint; + paint.setShader(shader)->unref(); + this->drawClippedRect(canvas, x, y, paint); + } + + typedef SkBenchmark INHERITED; +}; + +/////////////////////////////////////////////////////////////////////////////// + +DEF_BENCH( return new PerlinNoiseBench(p); ) + |