ec3ed6a5eb
I have manually examined all of these diffs and restored a few files that seem to require manual adjustment. The following files still need to be modified manually, in a separate CL: android_sample/SampleApp/AndroidManifest.xml android_sample/SampleApp/res/layout/layout.xml android_sample/SampleApp/res/menu/sample.xml android_sample/SampleApp/res/values/strings.xml android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java experimental/CiCarbonSampleMain.c experimental/CocoaDebugger/main.m experimental/FileReaderApp/main.m experimental/SimpleCocoaApp/main.m experimental/iOSSampleApp/Shared/SkAlertPrompt.h experimental/iOSSampleApp/Shared/SkAlertPrompt.m experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig gpu/src/android/GrGLDefaultInterface_android.cpp gyp/common.gypi gyp_skia include/ports/SkHarfBuzzFont.h include/views/SkOSWindow_wxwidgets.h make.bat make.py src/opts/memset.arm.S src/opts/memset16_neon.S src/opts/memset32_neon.S src/opts/opts_check_arm.cpp src/ports/SkDebug_brew.cpp src/ports/SkMemory_brew.cpp src/ports/SkOSFile_brew.cpp src/ports/SkXMLParser_empty.cpp src/utils/ios/SkImageDecoder_iOS.mm src/utils/ios/SkOSFile_iOS.mm src/utils/ios/SkStream_NSData.mm tests/FillPathTest.cpp Review URL: http://codereview.appspot.com/4816058 git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81
217 lines
7.0 KiB
C++
217 lines
7.0 KiB
C++
|
|
/*
|
|
* 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 "SkBitmap.h"
|
|
#include "SkCanvas.h"
|
|
#include "SkColorPriv.h"
|
|
#include "SkGradientShader.h"
|
|
#include "SkPaint.h"
|
|
#include "SkShader.h"
|
|
#include "SkString.h"
|
|
#include "SkUnitMapper.h"
|
|
|
|
struct GradData {
|
|
int fCount;
|
|
const SkColor* fColors;
|
|
const SkScalar* fPos;
|
|
};
|
|
|
|
static const SkColor gColors[] = {
|
|
SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorWHITE, SK_ColorBLACK
|
|
};
|
|
static const SkScalar gPos0[] = { 0, SK_Scalar1 };
|
|
static const SkScalar gPos1[] = { SK_Scalar1/4, SK_Scalar1*3/4 };
|
|
static const SkScalar gPos2[] = {
|
|
0, SK_Scalar1/8, SK_Scalar1/2, SK_Scalar1*7/8, SK_Scalar1
|
|
};
|
|
|
|
static const GradData gGradData[] = {
|
|
{ 2, gColors, NULL },
|
|
{ 2, gColors, gPos0 },
|
|
{ 2, gColors, gPos1 },
|
|
{ 5, gColors, NULL },
|
|
{ 5, gColors, gPos2 }
|
|
};
|
|
|
|
static SkShader* MakeLinear(const SkPoint pts[2], const GradData& data,
|
|
SkShader::TileMode tm, SkUnitMapper* mapper) {
|
|
return SkGradientShader::CreateLinear(pts, data.fColors, data.fPos,
|
|
data.fCount, tm, mapper);
|
|
}
|
|
|
|
static SkShader* MakeRadial(const SkPoint pts[2], const GradData& data,
|
|
SkShader::TileMode tm, SkUnitMapper* mapper) {
|
|
SkPoint center;
|
|
center.set(SkScalarAve(pts[0].fX, pts[1].fX),
|
|
SkScalarAve(pts[0].fY, pts[1].fY));
|
|
return SkGradientShader::CreateRadial(center, center.fX, data.fColors,
|
|
data.fPos, data.fCount, tm, mapper);
|
|
}
|
|
|
|
static SkShader* MakeSweep(const SkPoint pts[2], const GradData& data,
|
|
SkShader::TileMode tm, SkUnitMapper* mapper) {
|
|
SkPoint center;
|
|
center.set(SkScalarAve(pts[0].fX, pts[1].fX),
|
|
SkScalarAve(pts[0].fY, pts[1].fY));
|
|
return SkGradientShader::CreateSweep(center.fX, center.fY, data.fColors,
|
|
data.fPos, data.fCount, mapper);
|
|
}
|
|
|
|
static SkShader* Make2Radial(const SkPoint pts[2], const GradData& data,
|
|
SkShader::TileMode tm, SkUnitMapper* mapper) {
|
|
SkPoint center0, center1;
|
|
center0.set(SkScalarAve(pts[0].fX, pts[1].fX),
|
|
SkScalarAve(pts[0].fY, pts[1].fY));
|
|
center1.set(SkScalarInterp(pts[0].fX, pts[1].fX, SkIntToScalar(3)/5),
|
|
SkScalarInterp(pts[0].fY, pts[1].fY, SkIntToScalar(1)/4));
|
|
return SkGradientShader::CreateTwoPointRadial(
|
|
center1, (pts[1].fX - pts[0].fX) / 7,
|
|
center0, (pts[1].fX - pts[0].fX) / 2,
|
|
data.fColors, data.fPos, data.fCount, tm, mapper);
|
|
}
|
|
|
|
typedef SkShader* (*GradMaker)(const SkPoint pts[2], const GradData& data,
|
|
SkShader::TileMode tm, SkUnitMapper* mapper);
|
|
|
|
static const struct {
|
|
GradMaker fMaker;
|
|
const char* fName;
|
|
int fRepeat;
|
|
} gGrads[] = {
|
|
{ MakeLinear, "linear", 15 },
|
|
{ MakeRadial, "radial1", 10 },
|
|
{ MakeSweep, "sweep", 1 },
|
|
{ Make2Radial, "radial2", 5 },
|
|
};
|
|
|
|
enum GradType { // these must match the order in gGrads
|
|
kLinear_GradType,
|
|
kRadial_GradType,
|
|
kSweep_GradType,
|
|
kRadial2_GradType
|
|
};
|
|
|
|
static const char* tilemodename(SkShader::TileMode tm) {
|
|
switch (tm) {
|
|
case SkShader::kClamp_TileMode:
|
|
return "clamp";
|
|
case SkShader::kRepeat_TileMode:
|
|
return "repeat";
|
|
case SkShader::kMirror_TileMode:
|
|
return "mirror";
|
|
default:
|
|
SkASSERT(!"unknown tilemode");
|
|
return "error";
|
|
}
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
class GradientBench : public SkBenchmark {
|
|
SkString fName;
|
|
SkShader* fShader;
|
|
int fCount;
|
|
enum {
|
|
W = 400,
|
|
H = 400,
|
|
N = 1
|
|
};
|
|
public:
|
|
GradientBench(void* param, GradType gt,
|
|
SkShader::TileMode tm = SkShader::kClamp_TileMode) : INHERITED(param) {
|
|
fName.printf("gradient_%s_%s", gGrads[gt].fName, tilemodename(tm));
|
|
|
|
const SkPoint pts[2] = {
|
|
{ 0, 0 },
|
|
{ SkIntToScalar(W), SkIntToScalar(H) }
|
|
};
|
|
|
|
fCount = N * gGrads[gt].fRepeat;
|
|
fShader = gGrads[gt].fMaker(pts, gGradData[0], tm, NULL);
|
|
}
|
|
|
|
virtual ~GradientBench() {
|
|
fShader->unref();
|
|
}
|
|
|
|
protected:
|
|
virtual const char* onGetName() {
|
|
return fName.c_str();
|
|
}
|
|
|
|
virtual void onDraw(SkCanvas* canvas) {
|
|
SkPaint paint;
|
|
this->setupPaint(&paint);
|
|
|
|
paint.setShader(fShader);
|
|
|
|
SkRect r = { 0, 0, SkIntToScalar(W), SkIntToScalar(H) };
|
|
for (int i = 0; i < fCount; i++) {
|
|
canvas->drawRect(r, paint);
|
|
}
|
|
}
|
|
|
|
private:
|
|
typedef SkBenchmark INHERITED;
|
|
};
|
|
|
|
class Gradient2Bench : public SkBenchmark {
|
|
public:
|
|
Gradient2Bench(void* param) : INHERITED(param) {}
|
|
|
|
protected:
|
|
virtual const char* onGetName() {
|
|
return "gradient_create";
|
|
}
|
|
|
|
virtual void onDraw(SkCanvas* canvas) {
|
|
SkPaint paint;
|
|
this->setupPaint(&paint);
|
|
|
|
const SkRect r = { 0, 0, SkIntToScalar(4), SkIntToScalar(4) };
|
|
const SkPoint pts[] = {
|
|
{ 0, 0 },
|
|
{ SkIntToScalar(100), SkIntToScalar(100) },
|
|
};
|
|
|
|
for (int i = 0; i < 1000; i++) {
|
|
const int a = i % 256;
|
|
SkColor colors[] = { SK_ColorBLACK, SkColorSetARGB(a, a, a, a), SK_ColorWHITE };
|
|
SkShader* s = SkGradientShader::CreateLinear(pts, colors, NULL,
|
|
SK_ARRAY_COUNT(colors),
|
|
SkShader::kClamp_TileMode);
|
|
paint.setShader(s)->unref();
|
|
canvas->drawRect(r, paint);
|
|
}
|
|
}
|
|
|
|
private:
|
|
typedef SkBenchmark INHERITED;
|
|
};
|
|
|
|
static SkBenchmark* Fact0(void* p) { return new GradientBench(p, kLinear_GradType); }
|
|
static SkBenchmark* Fact01(void* p) { return new GradientBench(p, kLinear_GradType, SkShader::kMirror_TileMode); }
|
|
static SkBenchmark* Fact1(void* p) { return new GradientBench(p, kRadial_GradType); }
|
|
static SkBenchmark* Fact11(void* p) { return new GradientBench(p, kRadial_GradType, SkShader::kMirror_TileMode); }
|
|
static SkBenchmark* Fact2(void* p) { return new GradientBench(p, kSweep_GradType); }
|
|
static SkBenchmark* Fact3(void* p) { return new GradientBench(p, kRadial2_GradType); }
|
|
static SkBenchmark* Fact31(void* p) { return new GradientBench(p, kRadial2_GradType, SkShader::kMirror_TileMode); }
|
|
|
|
static SkBenchmark* Fact4(void* p) { return new Gradient2Bench(p); }
|
|
|
|
static BenchRegistry gReg0(Fact0);
|
|
static BenchRegistry gReg01(Fact01);
|
|
static BenchRegistry gReg1(Fact1);
|
|
static BenchRegistry gReg11(Fact11);
|
|
static BenchRegistry gReg2(Fact2);
|
|
static BenchRegistry gReg3(Fact3);
|
|
static BenchRegistry gReg31(Fact31);
|
|
|
|
static BenchRegistry gReg4(Fact4);
|
|
|