aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bench/BlurRectBench.cpp26
-rw-r--r--experimental/Intersection/CubicToQuadratics.cpp6
-rw-r--r--gm/blurrect.cpp8
-rw-r--r--src/effects/SkBlurMask.cpp62
-rw-r--r--src/effects/SkBlurMask.h4
-rw-r--r--src/gpu/gl/GrGLProgram.cpp2
-rw-r--r--src/gpu/gl/GrGLProgram.h4
-rw-r--r--src/gpu/gl/GrGLShaderBuilder.h2
8 files changed, 57 insertions, 57 deletions
diff --git a/bench/BlurRectBench.cpp b/bench/BlurRectBench.cpp
index 3e7bc8a5c3..355d55c2a1 100644
--- a/bench/BlurRectBench.cpp
+++ b/bench/BlurRectBench.cpp
@@ -31,11 +31,11 @@ protected:
virtual const char* onGetName() {
return fName.c_str();
}
-
+
SkScalar radius() const {
return fRadius;
}
-
+
void setName( SkString name ) {
fName = name;
}
@@ -48,9 +48,9 @@ protected:
int pad = fRadius * 1.5 + 1;
SkRect r = SkRect::MakeWH(2 * pad + 1, 2 * pad + 1);
-
+
int loop_count;
-
+
if (fRadius > SkIntToScalar(50)) {
loop_count = 10;
} else if (fRadius > SkIntToScalar(5)) {
@@ -58,14 +58,14 @@ protected:
} else {
loop_count = 10000;
}
-
+
preBenchSetup( r );
-
+
for (int i = 0; i < SkBENCHLOOP(loop_count); i++) {
makeBlurryRect( r );
}
}
-
+
virtual void makeBlurryRect( SkRect &r ) = 0;
virtual void preBenchSetup( SkRect &r ) {}
private:
@@ -77,13 +77,13 @@ class BlurRectDirectBench: public BlurRectBench {
public:
BlurRectDirectBench( void *param, SkScalar rad ) : BlurRectBench( param, rad ) {
SkString name;
-
+
if (SkScalarFraction(rad) != 0) {
name.printf("blurrect_direct_%.2f", SkScalarToFloat(rad));
} else {
name.printf("blurrect_direct_%d", SkScalarRound(rad));
}
-
+
setName( name );
}
protected:
@@ -103,20 +103,20 @@ public:
} else {
name.printf("blurrect_separable_%d", SkScalarRound(rad));
}
-
+
setName( name );
}
protected:
- virtual void preBenchSetup( SkRect &r ) {
+ virtual void preBenchSetup( SkRect &r ) {
fSrcMask.fFormat = SkMask::kA8_Format;
fSrcMask.fRowBytes = r.width();
fSrcMask.fBounds = SkIRect::MakeWH(r.width(), r.height());
fSrcMask.fImage = SkMask::AllocImage( fSrcMask.computeTotalImageSize() );
-
+
memset( fSrcMask.fImage, 0xff, fSrcMask.computeTotalImageSize() );
}
-
+
virtual void makeBlurryRect( SkRect &r ) {
SkMask mask;
SkBlurMask::BlurSeparable( &mask, fSrcMask, radius(), SkBlurMask::kNormal_Style, SkBlurMask::kHigh_Quality );
diff --git a/experimental/Intersection/CubicToQuadratics.cpp b/experimental/Intersection/CubicToQuadratics.cpp
index e3b97ffb79..7cea4d441c 100644
--- a/experimental/Intersection/CubicToQuadratics.cpp
+++ b/experimental/Intersection/CubicToQuadratics.cpp
@@ -3,7 +3,7 @@ http://stackoverflow.com/questions/2009160/how-do-i-convert-the-2-control-points
*/
/*
-Let's call the control points of the cubic Q0..Q3 and the control points of the quadratic P0..P2.
+Let's call the control points of the cubic Q0..Q3 and the control points of the quadratic P0..P2.
Then for degree elevation, the equations are:
Q0 = P0
@@ -25,11 +25,11 @@ Cubic defined by: P1/2 - anchor points, C1/C2 control points
|x| is the euclidean norm of x
mid-point approx of cubic: a quad that shares the same anchors with the cubic and has the
control point at C = (3·C2 - P2 + 3·C1 - P1)/4
-
+
Algorithm
pick an absolute precision (prec)
-Compute the Tdiv as the root of (cubic) equation
+Compute the Tdiv as the root of (cubic) equation
sqrt(3)/18 · |P2 - 3·C2 + 3·C1 - P1|/2 · Tdiv ^ 3 = prec
if Tdiv < 0.5 divide the cubic at Tdiv. First segment [0..Tdiv] can be approximated with by a
quadratic, with a defect less than prec, by the mid-point approximation.
diff --git a/gm/blurrect.cpp b/gm/blurrect.cpp
index bfe9bde204..ae2e5ea019 100644
--- a/gm/blurrect.cpp
+++ b/gm/blurrect.cpp
@@ -161,7 +161,7 @@ public:
, fRectHeight( rectHeight )
, fRadius( radius )
{}
-
+
int width() const { return fRectWidth; }
int height() const { return fRectHeight; }
int radius() const { return fRadius; }
@@ -174,7 +174,7 @@ protected:
virtual SkISize onISize() {
return SkISize::Make(640, 480);
}
-
+
virtual void makeMask( SkMask *m, SkRect r ) = 0;
virtual void onDraw(SkCanvas* canvas) {
@@ -221,7 +221,7 @@ protected:
memset( src.fImage, 0xff, src.computeTotalImageSize() );
- SkBlurMask::BlurSeparable( m, src, radius()/2, SkBlurMask::kNormal_Style, SkBlurMask::kHigh_Quality );
+ SkBlurMask::BlurSeparable( m, src, radius()/2, SkBlurMask::kNormal_Style, SkBlurMask::kHigh_Quality );
}
};
@@ -243,4 +243,4 @@ DEF_GM(return new BlurRectFastGM("blurrect_fast_10_100_10", 10, 100, 10);)
DEF_GM(return new BlurRectSlowGM("blurrect_slow_100_100_10", 100, 100, 10);)
DEF_GM(return new BlurRectSlowGM("blurrect_slow_100_100_2", 100, 100, 2);)
DEF_GM(return new BlurRectSlowGM("blurrect_slow_10_10_100", 10, 10, 100);)
-DEF_GM(return new BlurRectSlowGM("blurrect_slow_10_100_10", 10, 100, 10);) \ No newline at end of file
+DEF_GM(return new BlurRectSlowGM("blurrect_slow_10_100_10", 10, 100, 10);)
diff --git a/src/effects/SkBlurMask.cpp b/src/effects/SkBlurMask.cpp
index 766da539fe..b430727f31 100644
--- a/src/effects/SkBlurMask.cpp
+++ b/src/effects/SkBlurMask.cpp
@@ -12,10 +12,10 @@
#include "SkTemplates.h"
#include "SkEndian.h"
-// scale factor for the blur radius to match the behavior of the all existing blur
+// scale factor for the blur radius to match the behavior of the all existing blur
// code (both on the CPU and the GPU). This magic constant is 1/sqrt(3).
-// TODO: get rid of this fudge factor and move any required fudging up into
+// TODO: get rid of this fudge factor and move any required fudging up into
// the calling library
#define kBlurRadiusFudgeFactor SkFloatToScalar( .57735f )
@@ -1032,16 +1032,16 @@ bool SkBlurMask::Blur(SkMask* dst, const SkMask& src,
/* Convolving a box with itself three times results in a piecewise
quadratic function:
-
+
0 x <= -1.5
9/8 + 3/2 x + 1/2 x^2 -1.5 < x <= 1.5
3/4 - x^2 -.5 < x <= .5
9/8 - 3/2 x + 1/2 x^2 0.5 < x <= 1.5
0 1.5 < x
-
+
To get the profile curve of the blurred step function at the rectangle
edge, we evaluate the indefinite integral, which is piecewise cubic:
-
+
0 x <= -1.5
5/8 + 9/8 x + 3/4 x^2 + 1/6 x^3 -1.5 < x <= -0.5
1/2 + 3/4 x - 1/3 x^3 -.5 < x <= .5
@@ -1069,16 +1069,16 @@ static float gaussian_integral( float x ) {
return 0.4375 + (-x3 / 6 - 3 * x2 / 4 - 1.125 * x);
}
-/*
+/*
compute_profile allocates and fills in an array of floating
- point values between 0 and 255 for the profile signature of
+ point values between 0 and 255 for the profile signature of
a blurred half-plane with the given blur radius. Since we're
going to be doing screened multiplications (i.e., 1 - (1-x)(1-y))
all the time, we actually fill in the profile pre-inverted
(already done 255-x).
-
+
The function returns the size of the array allocated for the
- profile. It's the responsibility of the caller to delete the
+ profile. It's the responsibility of the caller to delete the
memory returned in profile_out.
*/
@@ -1101,7 +1101,7 @@ static int compute_profile( SkScalar radius, unsigned int **profile_out ) {
return size;
}
-// TODO MAYBE: Maintain a profile cache to avoid recomputing this for
+// TODO MAYBE: Maintain a profile cache to avoid recomputing this for
// commonly used radii. Consider baking some of the most common blur radii
// directly in as static data?
@@ -1113,71 +1113,71 @@ bool SkBlurMask::BlurRect(SkMask *dst, const SkRect &src,
SkIPoint *margin) {
int profile_size;
unsigned int *profile;
-
-
+
+
float radius = SkScalarToFloat( SkScalarMul( provided_radius, kBlurRadiusFudgeFactor ) );
-
+
profile_size = compute_profile( radius, &profile );
-
+
int pad = (int) (radius * 1.5f + 1);
if (margin) {
margin->set( pad, pad );
}
dst->fBounds = SkIRect::MakeWH(src.width(), src.height());
dst->fBounds.outset(pad, pad);
-
+
dst->fRowBytes = dst->fBounds.width();
dst->fFormat = SkMask::kA8_Format;
dst->fImage = NULL;
-
+
size_t dstSize = dst->computeImageSize();
if (0 == dstSize) {
return false; // too big to allocate, abort
}
-
+
int sw = src.width();
int sh = src.height();
-
+
uint8_t* dp = SkMask::AllocImage(dstSize);
-
+
dst->fImage = dp;
-
+
SkAutoTCallVProc<uint8_t, SkMask_FreeImage> autoCall(dp);
-
+
int dst_height = dst->fBounds.height();
int dst_width = dst->fBounds.width();
-
+
// nearest odd number less than the profile size represents the center
// of the (2x scaled) profile
int center = ( profile_size & ~1 ) - 1;
-
+
int w = sw - center;
int h = sh - center;
-
+
uint8_t *outptr = dp;
-
+
for (int y = 0 ; y < dst_height ; y++)
{
// time to fill in a scanline of the blurry rectangle.
// to avoid floating point math, everything is multiplied by
// 2 where needed. This keeps things nice and integer-oriented.
-
+
int dy = abs((y << 1) - dst_height) - h; // how far are we from the original edge?
int oy = dy >> 1;
if (oy < 0) oy = 0;
-
+
unsigned int profile_y = profile[oy];
-
+
for (int x = 0 ; x < (dst_width << 1) ; x += 2) {
int dx = abs( x - dst_width ) - w;
int ox = dx >> 1;
if (ox < 0) ox = 0;
-
+
unsigned int maskval = SkMulDiv255Round(profile[ox], profile_y);
-
+
*(outptr++) = maskval;
}
}
-
+
return true;
}
diff --git a/src/effects/SkBlurMask.h b/src/effects/SkBlurMask.h
index a15dabcf05..b46576ceeb 100644
--- a/src/effects/SkBlurMask.h
+++ b/src/effects/SkBlurMask.h
@@ -28,8 +28,8 @@ public:
kHigh_Quality //!< three pass box blur (similar to gaussian)
};
- static bool BlurRect(SkMask *dst, const SkRect &src,
- SkScalar radius, Style style, Quality quality,
+ static bool BlurRect(SkMask *dst, const SkRect &src,
+ SkScalar radius, Style style, Quality quality,
SkIPoint *margin = NULL);
static bool Blur(SkMask* dst, const SkMask& src,
diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
index b57177b8b7..63e991f654 100644
--- a/src/gpu/gl/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -912,4 +912,4 @@ void GrGLProgram::setData(GrGpuGL* gpu) {
}
}
}
-} \ No newline at end of file
+}
diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h
index e334391b67..513bf75d23 100644
--- a/src/gpu/gl/GrGLProgram.h
+++ b/src/gpu/gl/GrGLProgram.h
@@ -173,7 +173,7 @@ private:
const char* adjustInColor(const SkString& inColor) const;
typedef SkSTArray<4, UniformHandle, true> SamplerUniSArray;
-
+
struct UniformHandles {
UniformHandle fViewMatrixUni;
UniformHandle fColorUni;
@@ -184,7 +184,7 @@ private:
UniformHandle fRTHeightUni;
// An array of sampler uniform handles for each effect.
SamplerUniSArray fSamplerUnis[GrDrawState::kNumStages];
-
+
UniformHandles() {
fViewMatrixUni = GrGLUniformManager::kInvalidUniformHandle;
fColorUni = GrGLUniformManager::kInvalidUniformHandle;
diff --git a/src/gpu/gl/GrGLShaderBuilder.h b/src/gpu/gl/GrGLShaderBuilder.h
index 8934280cd0..87136cdf53 100644
--- a/src/gpu/gl/GrGLShaderBuilder.h
+++ b/src/gpu/gl/GrGLShaderBuilder.h
@@ -181,7 +181,7 @@ public:
GrBackendEffectFactory::EffectKey key,
const char* fsInColor, // NULL means no incoming color
const char* fsOutColor,
- const char* vsInCoord,
+ const char* vsInCoord,
SkTArray<GrGLUniformManager::UniformHandle, true>* samplerHandles);
GrGLUniformManager::UniformHandle getRTHeightUniform() const { return fRTHeightUniform; }
// TODO: Make this do all the compiling, linking, etc.
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-13 09:47:52 +0000