rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 1 | |
| 2 | /* |
| 3 | * Copyright 2012 Google Inc. |
| 4 | * |
| 5 | * Use of this source code is governed by a BSD-style license that can be |
| 6 | * found in the LICENSE file. |
| 7 | */ |
| 8 | |
| 9 | #include "SkRadialGradient.h" |
| 10 | #include "SkRadialGradient_Table.h" |
| 11 | |
| 12 | #define kSQRT_TABLE_BITS 11 |
| 13 | #define kSQRT_TABLE_SIZE (1 << kSQRT_TABLE_BITS) |
| 14 | |
reed@google.com | 4ec5c95 | 2013-12-19 15:00:18 +0000 | [diff] [blame] | 15 | #if 0 |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 16 | |
| 17 | #include <stdio.h> |
| 18 | |
| 19 | void SkRadialGradient_BuildTable() { |
| 20 | // build it 0..127 x 0..127, so we use 2^15 - 1 in the numerator for our "fixed" table |
| 21 | |
| 22 | FILE* file = ::fopen("SkRadialGradient_Table.h", "w"); |
| 23 | SkASSERT(file); |
| 24 | ::fprintf(file, "static const uint8_t gSqrt8Table[] = {\n"); |
| 25 | |
| 26 | for (int i = 0; i < kSQRT_TABLE_SIZE; i++) { |
| 27 | if ((i & 15) == 0) { |
| 28 | ::fprintf(file, "\t"); |
| 29 | } |
| 30 | |
| 31 | uint8_t value = SkToU8(SkFixedSqrt(i * SK_Fixed1 / kSQRT_TABLE_SIZE) >> 8); |
| 32 | |
| 33 | ::fprintf(file, "0x%02X", value); |
| 34 | if (i < kSQRT_TABLE_SIZE-1) { |
| 35 | ::fprintf(file, ", "); |
| 36 | } |
| 37 | if ((i & 15) == 15) { |
| 38 | ::fprintf(file, "\n"); |
| 39 | } |
| 40 | } |
| 41 | ::fprintf(file, "};\n"); |
| 42 | ::fclose(file); |
| 43 | } |
| 44 | |
| 45 | #endif |
| 46 | |
| 47 | namespace { |
| 48 | |
commit-bot@chromium.org | 34150b4 | 2013-10-16 18:59:44 +0000 | [diff] [blame] | 49 | // GCC doesn't like using static functions as template arguments. So force these to be non-static. |
| 50 | inline SkFixed mirror_tileproc_nonstatic(SkFixed x) { |
| 51 | return mirror_tileproc(x); |
| 52 | } |
| 53 | |
| 54 | inline SkFixed repeat_tileproc_nonstatic(SkFixed x) { |
| 55 | return repeat_tileproc(x); |
| 56 | } |
| 57 | |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 58 | void rad_to_unit_matrix(const SkPoint& center, SkScalar radius, |
| 59 | SkMatrix* matrix) { |
| 60 | SkScalar inv = SkScalarInvert(radius); |
| 61 | |
| 62 | matrix->setTranslate(-center.fX, -center.fY); |
| 63 | matrix->postScale(inv, inv); |
| 64 | } |
| 65 | |
| 66 | typedef void (* RadialShade16Proc)(SkScalar sfx, SkScalar sdx, |
| 67 | SkScalar sfy, SkScalar sdy, |
| 68 | uint16_t* dstC, const uint16_t* cache, |
| 69 | int toggle, int count); |
| 70 | |
| 71 | void shadeSpan16_radial_clamp(SkScalar sfx, SkScalar sdx, |
| 72 | SkScalar sfy, SkScalar sdy, |
| 73 | uint16_t* SK_RESTRICT dstC, const uint16_t* SK_RESTRICT cache, |
| 74 | int toggle, int count) { |
| 75 | const uint8_t* SK_RESTRICT sqrt_table = gSqrt8Table; |
| 76 | |
| 77 | /* knock these down so we can pin against +- 0x7FFF, which is an |
| 78 | immediate load, rather than 0xFFFF which is slower. This is a |
| 79 | compromise, since it reduces our precision, but that appears |
| 80 | to be visually OK. If we decide this is OK for all of our cases, |
| 81 | we could (it seems) put this scale-down into fDstToIndex, |
| 82 | to avoid having to do these extra shifts each time. |
| 83 | */ |
| 84 | SkFixed fx = SkScalarToFixed(sfx) >> 1; |
| 85 | SkFixed dx = SkScalarToFixed(sdx) >> 1; |
| 86 | SkFixed fy = SkScalarToFixed(sfy) >> 1; |
| 87 | SkFixed dy = SkScalarToFixed(sdy) >> 1; |
| 88 | // might perform this check for the other modes, |
| 89 | // but the win will be a smaller % of the total |
| 90 | if (dy == 0) { |
| 91 | fy = SkPin32(fy, -0xFFFF >> 1, 0xFFFF >> 1); |
| 92 | fy *= fy; |
| 93 | do { |
| 94 | unsigned xx = SkPin32(fx, -0xFFFF >> 1, 0xFFFF >> 1); |
| 95 | unsigned fi = (xx * xx + fy) >> (14 + 16 - kSQRT_TABLE_BITS); |
| 96 | fi = SkFastMin32(fi, 0xFFFF >> (16 - kSQRT_TABLE_BITS)); |
| 97 | fx += dx; |
| 98 | *dstC++ = cache[toggle + |
| 99 | (sqrt_table[fi] >> SkGradientShaderBase::kSqrt16Shift)]; |
reed@google.com | 55853db | 2013-02-01 19:34:59 +0000 | [diff] [blame] | 100 | toggle = next_dither_toggle16(toggle); |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 101 | } while (--count != 0); |
| 102 | } else { |
| 103 | do { |
| 104 | unsigned xx = SkPin32(fx, -0xFFFF >> 1, 0xFFFF >> 1); |
| 105 | unsigned fi = SkPin32(fy, -0xFFFF >> 1, 0xFFFF >> 1); |
| 106 | fi = (xx * xx + fi * fi) >> (14 + 16 - kSQRT_TABLE_BITS); |
| 107 | fi = SkFastMin32(fi, 0xFFFF >> (16 - kSQRT_TABLE_BITS)); |
| 108 | fx += dx; |
| 109 | fy += dy; |
| 110 | *dstC++ = cache[toggle + |
| 111 | (sqrt_table[fi] >> SkGradientShaderBase::kSqrt16Shift)]; |
reed@google.com | 55853db | 2013-02-01 19:34:59 +0000 | [diff] [blame] | 112 | toggle = next_dither_toggle16(toggle); |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 113 | } while (--count != 0); |
| 114 | } |
| 115 | } |
| 116 | |
commit-bot@chromium.org | 34150b4 | 2013-10-16 18:59:44 +0000 | [diff] [blame] | 117 | template <SkFixed (*TileProc)(SkFixed)> |
| 118 | void shadeSpan16_radial(SkScalar fx, SkScalar dx, SkScalar fy, SkScalar dy, |
| 119 | uint16_t* SK_RESTRICT dstC, const uint16_t* SK_RESTRICT cache, |
| 120 | int toggle, int count) { |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 121 | do { |
commit-bot@chromium.org | 34150b4 | 2013-10-16 18:59:44 +0000 | [diff] [blame] | 122 | const SkFixed dist = SkFloatToFixed(sk_float_sqrt(fx*fx + fy*fy)); |
| 123 | const unsigned fi = TileProc(dist); |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 124 | SkASSERT(fi <= 0xFFFF); |
| 125 | *dstC++ = cache[toggle + (fi >> SkGradientShaderBase::kCache16Shift)]; |
reed@google.com | 55853db | 2013-02-01 19:34:59 +0000 | [diff] [blame] | 126 | toggle = next_dither_toggle16(toggle); |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 127 | fx += dx; |
| 128 | fy += dy; |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 129 | } while (--count != 0); |
| 130 | } |
| 131 | |
commit-bot@chromium.org | 34150b4 | 2013-10-16 18:59:44 +0000 | [diff] [blame] | 132 | void shadeSpan16_radial_mirror(SkScalar fx, SkScalar dx, SkScalar fy, SkScalar dy, |
| 133 | uint16_t* SK_RESTRICT dstC, const uint16_t* SK_RESTRICT cache, |
| 134 | int toggle, int count) { |
| 135 | shadeSpan16_radial<mirror_tileproc_nonstatic>(fx, dx, fy, dy, dstC, cache, toggle, count); |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 136 | } |
| 137 | |
commit-bot@chromium.org | 34150b4 | 2013-10-16 18:59:44 +0000 | [diff] [blame] | 138 | void shadeSpan16_radial_repeat(SkScalar fx, SkScalar dx, SkScalar fy, SkScalar dy, |
| 139 | uint16_t* SK_RESTRICT dstC, const uint16_t* SK_RESTRICT cache, |
| 140 | int toggle, int count) { |
| 141 | shadeSpan16_radial<repeat_tileproc_nonstatic>(fx, dx, fy, dy, dstC, cache, toggle, count); |
| 142 | } |
| 143 | |
| 144 | } // namespace |
| 145 | |
rileya@google.com | 98e8b6d | 2012-07-31 20:38:06 +0000 | [diff] [blame] | 146 | ///////////////////////////////////////////////////////////////////// |
| 147 | |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 148 | SkRadialGradient::SkRadialGradient(const SkPoint& center, SkScalar radius, |
commit-bot@chromium.org | 9c9005a | 2014-04-28 14:55:39 +0000 | [diff] [blame] | 149 | const Descriptor& desc, const SkMatrix* localMatrix) |
| 150 | : SkGradientShaderBase(desc, localMatrix), |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 151 | fCenter(center), |
| 152 | fRadius(radius) |
| 153 | { |
| 154 | // make sure our table is insync with our current #define for kSQRT_TABLE_SIZE |
| 155 | SkASSERT(sizeof(gSqrt8Table) == kSQRT_TABLE_SIZE); |
| 156 | |
| 157 | rad_to_unit_matrix(center, radius, &fPtsToUnit); |
| 158 | } |
| 159 | |
commit-bot@chromium.org | 87fcd95 | 2014-04-23 19:10:51 +0000 | [diff] [blame] | 160 | size_t SkRadialGradient::contextSize() const { |
| 161 | return sizeof(RadialGradientContext); |
| 162 | } |
| 163 | |
commit-bot@chromium.org | ce56d96 | 2014-05-05 18:39:18 +0000 | [diff] [blame] | 164 | SkShader::Context* SkRadialGradient::onCreateContext(const ContextRec& rec, void* storage) const { |
commit-bot@chromium.org | e901b6d | 2014-05-01 19:31:31 +0000 | [diff] [blame] | 165 | return SkNEW_PLACEMENT_ARGS(storage, RadialGradientContext, (*this, rec)); |
commit-bot@chromium.org | 87fcd95 | 2014-04-23 19:10:51 +0000 | [diff] [blame] | 166 | } |
| 167 | |
| 168 | SkRadialGradient::RadialGradientContext::RadialGradientContext( |
commit-bot@chromium.org | e901b6d | 2014-05-01 19:31:31 +0000 | [diff] [blame] | 169 | const SkRadialGradient& shader, const ContextRec& rec) |
| 170 | : INHERITED(shader, rec) {} |
commit-bot@chromium.org | 87fcd95 | 2014-04-23 19:10:51 +0000 | [diff] [blame] | 171 | |
| 172 | void SkRadialGradient::RadialGradientContext::shadeSpan16(int x, int y, uint16_t* dstCParam, |
| 173 | int count) { |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 174 | SkASSERT(count > 0); |
| 175 | |
commit-bot@chromium.org | 87fcd95 | 2014-04-23 19:10:51 +0000 | [diff] [blame] | 176 | const SkRadialGradient& radialGradient = static_cast<const SkRadialGradient&>(fShader); |
| 177 | |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 178 | uint16_t* SK_RESTRICT dstC = dstCParam; |
| 179 | |
| 180 | SkPoint srcPt; |
| 181 | SkMatrix::MapXYProc dstProc = fDstToIndexProc; |
commit-bot@chromium.org | 87fcd95 | 2014-04-23 19:10:51 +0000 | [diff] [blame] | 182 | TileProc proc = radialGradient.fTileProc; |
| 183 | const uint16_t* SK_RESTRICT cache = fCache->getCache16(); |
reed@google.com | 55853db | 2013-02-01 19:34:59 +0000 | [diff] [blame] | 184 | int toggle = init_dither_toggle16(x, y); |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 185 | |
| 186 | if (fDstToIndexClass != kPerspective_MatrixClass) { |
| 187 | dstProc(fDstToIndex, SkIntToScalar(x) + SK_ScalarHalf, |
| 188 | SkIntToScalar(y) + SK_ScalarHalf, &srcPt); |
| 189 | |
| 190 | SkScalar sdx = fDstToIndex.getScaleX(); |
| 191 | SkScalar sdy = fDstToIndex.getSkewY(); |
| 192 | |
| 193 | if (fDstToIndexClass == kFixedStepInX_MatrixClass) { |
| 194 | SkFixed storage[2]; |
| 195 | (void)fDstToIndex.fixedStepInX(SkIntToScalar(y), |
| 196 | &storage[0], &storage[1]); |
| 197 | sdx = SkFixedToScalar(storage[0]); |
| 198 | sdy = SkFixedToScalar(storage[1]); |
| 199 | } else { |
| 200 | SkASSERT(fDstToIndexClass == kLinear_MatrixClass); |
| 201 | } |
| 202 | |
| 203 | RadialShade16Proc shadeProc = shadeSpan16_radial_repeat; |
commit-bot@chromium.org | 87fcd95 | 2014-04-23 19:10:51 +0000 | [diff] [blame] | 204 | if (SkShader::kClamp_TileMode == radialGradient.fTileMode) { |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 205 | shadeProc = shadeSpan16_radial_clamp; |
commit-bot@chromium.org | 87fcd95 | 2014-04-23 19:10:51 +0000 | [diff] [blame] | 206 | } else if (SkShader::kMirror_TileMode == radialGradient.fTileMode) { |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 207 | shadeProc = shadeSpan16_radial_mirror; |
| 208 | } else { |
commit-bot@chromium.org | 87fcd95 | 2014-04-23 19:10:51 +0000 | [diff] [blame] | 209 | SkASSERT(SkShader::kRepeat_TileMode == radialGradient.fTileMode); |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 210 | } |
| 211 | (*shadeProc)(srcPt.fX, sdx, srcPt.fY, sdy, dstC, |
| 212 | cache, toggle, count); |
| 213 | } else { // perspective case |
| 214 | SkScalar dstX = SkIntToScalar(x); |
| 215 | SkScalar dstY = SkIntToScalar(y); |
| 216 | do { |
| 217 | dstProc(fDstToIndex, dstX, dstY, &srcPt); |
| 218 | unsigned fi = proc(SkScalarToFixed(srcPt.length())); |
| 219 | SkASSERT(fi <= 0xFFFF); |
| 220 | |
| 221 | int index = fi >> (16 - kCache16Bits); |
| 222 | *dstC++ = cache[toggle + index]; |
reed@google.com | 55853db | 2013-02-01 19:34:59 +0000 | [diff] [blame] | 223 | toggle = next_dither_toggle16(toggle); |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 224 | |
| 225 | dstX += SK_Scalar1; |
| 226 | } while (--count != 0); |
| 227 | } |
| 228 | } |
| 229 | |
rmistry@google.com | fbfcd56 | 2012-08-23 18:09:54 +0000 | [diff] [blame] | 230 | SkShader::BitmapType SkRadialGradient::asABitmap(SkBitmap* bitmap, |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 231 | SkMatrix* matrix, SkShader::TileMode* xy) const { |
| 232 | if (bitmap) { |
rileya@google.com | 1c6d64b | 2012-07-27 15:49:05 +0000 | [diff] [blame] | 233 | this->getGradientTableBitmap(bitmap); |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 234 | } |
| 235 | if (matrix) { |
reed@google.com | 3c2102c | 2013-02-01 12:59:40 +0000 | [diff] [blame] | 236 | matrix->setScale(SkIntToScalar(kCache32Count), |
| 237 | SkIntToScalar(kCache32Count)); |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 238 | matrix->preConcat(fPtsToUnit); |
| 239 | } |
| 240 | if (xy) { |
| 241 | xy[0] = fTileMode; |
| 242 | xy[1] = kClamp_TileMode; |
| 243 | } |
| 244 | return kRadial_BitmapType; |
| 245 | } |
| 246 | |
| 247 | SkShader::GradientType SkRadialGradient::asAGradient(GradientInfo* info) const { |
| 248 | if (info) { |
| 249 | commonAsAGradient(info); |
| 250 | info->fPoint[0] = fCenter; |
| 251 | info->fRadius[0] = fRadius; |
| 252 | } |
| 253 | return kRadial_GradientType; |
| 254 | } |
| 255 | |
commit-bot@chromium.org | 8b0e8ac | 2014-01-30 18:58:24 +0000 | [diff] [blame] | 256 | SkRadialGradient::SkRadialGradient(SkReadBuffer& buffer) |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 257 | : INHERITED(buffer), |
| 258 | fCenter(buffer.readPoint()), |
| 259 | fRadius(buffer.readScalar()) { |
| 260 | } |
| 261 | |
commit-bot@chromium.org | 8b0e8ac | 2014-01-30 18:58:24 +0000 | [diff] [blame] | 262 | void SkRadialGradient::flatten(SkWriteBuffer& buffer) const { |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 263 | this->INHERITED::flatten(buffer); |
| 264 | buffer.writePoint(fCenter); |
| 265 | buffer.writeScalar(fRadius); |
| 266 | } |
| 267 | |
| 268 | namespace { |
| 269 | |
| 270 | inline bool radial_completely_pinned(int fx, int dx, int fy, int dy) { |
| 271 | // fast, overly-conservative test: checks unit square instead |
| 272 | // of unit circle |
| 273 | bool xClamped = (fx >= SK_FixedHalf && dx >= 0) || |
| 274 | (fx <= -SK_FixedHalf && dx <= 0); |
| 275 | bool yClamped = (fy >= SK_FixedHalf && dy >= 0) || |
| 276 | (fy <= -SK_FixedHalf && dy <= 0); |
| 277 | |
| 278 | return xClamped || yClamped; |
| 279 | } |
| 280 | |
| 281 | // Return true if (fx * fy) is always inside the unit circle |
| 282 | // SkPin32 is expensive, but so are all the SkFixedMul in this test, |
| 283 | // so it shouldn't be run if count is small. |
| 284 | inline bool no_need_for_radial_pin(int fx, int dx, |
| 285 | int fy, int dy, int count) { |
| 286 | SkASSERT(count > 0); |
| 287 | if (SkAbs32(fx) > 0x7FFF || SkAbs32(fy) > 0x7FFF) { |
| 288 | return false; |
| 289 | } |
| 290 | if (fx*fx + fy*fy > 0x7FFF*0x7FFF) { |
| 291 | return false; |
| 292 | } |
| 293 | fx += (count - 1) * dx; |
| 294 | fy += (count - 1) * dy; |
| 295 | if (SkAbs32(fx) > 0x7FFF || SkAbs32(fy) > 0x7FFF) { |
| 296 | return false; |
| 297 | } |
| 298 | return fx*fx + fy*fy <= 0x7FFF*0x7FFF; |
| 299 | } |
| 300 | |
| 301 | #define UNPINNED_RADIAL_STEP \ |
| 302 | fi = (fx * fx + fy * fy) >> (14 + 16 - kSQRT_TABLE_BITS); \ |
| 303 | *dstC++ = cache[toggle + \ |
| 304 | (sqrt_table[fi] >> SkGradientShaderBase::kSqrt32Shift)]; \ |
reed@google.com | 55853db | 2013-02-01 19:34:59 +0000 | [diff] [blame] | 305 | toggle = next_dither_toggle(toggle); \ |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 306 | fx += dx; \ |
| 307 | fy += dy; |
| 308 | |
| 309 | typedef void (* RadialShadeProc)(SkScalar sfx, SkScalar sdx, |
| 310 | SkScalar sfy, SkScalar sdy, |
| 311 | SkPMColor* dstC, const SkPMColor* cache, |
| 312 | int count, int toggle); |
| 313 | |
| 314 | // On Linux, this is faster with SkPMColor[] params than SkPMColor* SK_RESTRICT |
| 315 | void shadeSpan_radial_clamp(SkScalar sfx, SkScalar sdx, |
| 316 | SkScalar sfy, SkScalar sdy, |
| 317 | SkPMColor* SK_RESTRICT dstC, const SkPMColor* SK_RESTRICT cache, |
| 318 | int count, int toggle) { |
| 319 | // Floating point seems to be slower than fixed point, |
| 320 | // even when we have float hardware. |
| 321 | const uint8_t* SK_RESTRICT sqrt_table = gSqrt8Table; |
| 322 | SkFixed fx = SkScalarToFixed(sfx) >> 1; |
| 323 | SkFixed dx = SkScalarToFixed(sdx) >> 1; |
| 324 | SkFixed fy = SkScalarToFixed(sfy) >> 1; |
| 325 | SkFixed dy = SkScalarToFixed(sdy) >> 1; |
| 326 | if ((count > 4) && radial_completely_pinned(fx, dx, fy, dy)) { |
reed@google.com | 3c2102c | 2013-02-01 12:59:40 +0000 | [diff] [blame] | 327 | unsigned fi = SkGradientShaderBase::kCache32Count - 1; |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 328 | sk_memset32_dither(dstC, |
| 329 | cache[toggle + fi], |
reed@google.com | 55853db | 2013-02-01 19:34:59 +0000 | [diff] [blame] | 330 | cache[next_dither_toggle(toggle) + fi], |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 331 | count); |
| 332 | } else if ((count > 4) && |
| 333 | no_need_for_radial_pin(fx, dx, fy, dy, count)) { |
| 334 | unsigned fi; |
| 335 | // 4x unroll appears to be no faster than 2x unroll on Linux |
| 336 | while (count > 1) { |
| 337 | UNPINNED_RADIAL_STEP; |
| 338 | UNPINNED_RADIAL_STEP; |
| 339 | count -= 2; |
| 340 | } |
| 341 | if (count) { |
| 342 | UNPINNED_RADIAL_STEP; |
| 343 | } |
reed@google.com | 6004029 | 2013-02-04 18:21:23 +0000 | [diff] [blame] | 344 | } else { |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 345 | // Specializing for dy == 0 gains us 25% on Skia benchmarks |
| 346 | if (dy == 0) { |
| 347 | unsigned yy = SkPin32(fy, -0xFFFF >> 1, 0xFFFF >> 1); |
| 348 | yy *= yy; |
| 349 | do { |
| 350 | unsigned xx = SkPin32(fx, -0xFFFF >> 1, 0xFFFF >> 1); |
| 351 | unsigned fi = (xx * xx + yy) >> (14 + 16 - kSQRT_TABLE_BITS); |
| 352 | fi = SkFastMin32(fi, 0xFFFF >> (16 - kSQRT_TABLE_BITS)); |
| 353 | *dstC++ = cache[toggle + (sqrt_table[fi] >> |
| 354 | SkGradientShaderBase::kSqrt32Shift)]; |
reed@google.com | 55853db | 2013-02-01 19:34:59 +0000 | [diff] [blame] | 355 | toggle = next_dither_toggle(toggle); |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 356 | fx += dx; |
| 357 | } while (--count != 0); |
| 358 | } else { |
| 359 | do { |
| 360 | unsigned xx = SkPin32(fx, -0xFFFF >> 1, 0xFFFF >> 1); |
| 361 | unsigned fi = SkPin32(fy, -0xFFFF >> 1, 0xFFFF >> 1); |
| 362 | fi = (xx * xx + fi * fi) >> (14 + 16 - kSQRT_TABLE_BITS); |
| 363 | fi = SkFastMin32(fi, 0xFFFF >> (16 - kSQRT_TABLE_BITS)); |
| 364 | *dstC++ = cache[toggle + (sqrt_table[fi] >> |
| 365 | SkGradientShaderBase::kSqrt32Shift)]; |
reed@google.com | 55853db | 2013-02-01 19:34:59 +0000 | [diff] [blame] | 366 | toggle = next_dither_toggle(toggle); |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 367 | fx += dx; |
| 368 | fy += dy; |
| 369 | } while (--count != 0); |
| 370 | } |
| 371 | } |
| 372 | } |
| 373 | |
| 374 | // Unrolling this loop doesn't seem to help (when float); we're stalling to |
| 375 | // get the results of the sqrt (?), and don't have enough extra registers to |
| 376 | // have many in flight. |
commit-bot@chromium.org | 34150b4 | 2013-10-16 18:59:44 +0000 | [diff] [blame] | 377 | template <SkFixed (*TileProc)(SkFixed)> |
| 378 | void shadeSpan_radial(SkScalar fx, SkScalar dx, SkScalar fy, SkScalar dy, |
| 379 | SkPMColor* SK_RESTRICT dstC, const SkPMColor* SK_RESTRICT cache, |
| 380 | int count, int toggle) { |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 381 | do { |
commit-bot@chromium.org | 34150b4 | 2013-10-16 18:59:44 +0000 | [diff] [blame] | 382 | const SkFixed dist = SkFloatToFixed(sk_float_sqrt(fx*fx + fy*fy)); |
| 383 | const unsigned fi = TileProc(dist); |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 384 | SkASSERT(fi <= 0xFFFF); |
| 385 | *dstC++ = cache[toggle + (fi >> SkGradientShaderBase::kCache32Shift)]; |
reed@google.com | 55853db | 2013-02-01 19:34:59 +0000 | [diff] [blame] | 386 | toggle = next_dither_toggle(toggle); |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 387 | fx += dx; |
| 388 | fy += dy; |
| 389 | } while (--count != 0); |
| 390 | } |
commit-bot@chromium.org | 34150b4 | 2013-10-16 18:59:44 +0000 | [diff] [blame] | 391 | |
| 392 | void shadeSpan_radial_mirror(SkScalar fx, SkScalar dx, SkScalar fy, SkScalar dy, |
| 393 | SkPMColor* SK_RESTRICT dstC, const SkPMColor* SK_RESTRICT cache, |
| 394 | int count, int toggle) { |
| 395 | shadeSpan_radial<mirror_tileproc_nonstatic>(fx, dx, fy, dy, dstC, cache, count, toggle); |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 396 | } |
| 397 | |
commit-bot@chromium.org | 34150b4 | 2013-10-16 18:59:44 +0000 | [diff] [blame] | 398 | void shadeSpan_radial_repeat(SkScalar fx, SkScalar dx, SkScalar fy, SkScalar dy, |
| 399 | SkPMColor* SK_RESTRICT dstC, const SkPMColor* SK_RESTRICT cache, |
| 400 | int count, int toggle) { |
| 401 | shadeSpan_radial<repeat_tileproc_nonstatic>(fx, dx, fy, dy, dstC, cache, count, toggle); |
| 402 | } |
| 403 | |
| 404 | } // namespace |
| 405 | |
commit-bot@chromium.org | 87fcd95 | 2014-04-23 19:10:51 +0000 | [diff] [blame] | 406 | void SkRadialGradient::RadialGradientContext::shadeSpan(int x, int y, |
| 407 | SkPMColor* SK_RESTRICT dstC, int count) { |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 408 | SkASSERT(count > 0); |
| 409 | |
commit-bot@chromium.org | 87fcd95 | 2014-04-23 19:10:51 +0000 | [diff] [blame] | 410 | const SkRadialGradient& radialGradient = static_cast<const SkRadialGradient&>(fShader); |
| 411 | |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 412 | SkPoint srcPt; |
| 413 | SkMatrix::MapXYProc dstProc = fDstToIndexProc; |
commit-bot@chromium.org | 87fcd95 | 2014-04-23 19:10:51 +0000 | [diff] [blame] | 414 | TileProc proc = radialGradient.fTileProc; |
| 415 | const SkPMColor* SK_RESTRICT cache = fCache->getCache32(); |
reed@google.com | 55853db | 2013-02-01 19:34:59 +0000 | [diff] [blame] | 416 | int toggle = init_dither_toggle(x, y); |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 417 | |
| 418 | if (fDstToIndexClass != kPerspective_MatrixClass) { |
| 419 | dstProc(fDstToIndex, SkIntToScalar(x) + SK_ScalarHalf, |
| 420 | SkIntToScalar(y) + SK_ScalarHalf, &srcPt); |
| 421 | SkScalar sdx = fDstToIndex.getScaleX(); |
| 422 | SkScalar sdy = fDstToIndex.getSkewY(); |
| 423 | |
| 424 | if (fDstToIndexClass == kFixedStepInX_MatrixClass) { |
| 425 | SkFixed storage[2]; |
| 426 | (void)fDstToIndex.fixedStepInX(SkIntToScalar(y), |
| 427 | &storage[0], &storage[1]); |
| 428 | sdx = SkFixedToScalar(storage[0]); |
| 429 | sdy = SkFixedToScalar(storage[1]); |
| 430 | } else { |
| 431 | SkASSERT(fDstToIndexClass == kLinear_MatrixClass); |
| 432 | } |
| 433 | |
| 434 | RadialShadeProc shadeProc = shadeSpan_radial_repeat; |
commit-bot@chromium.org | 87fcd95 | 2014-04-23 19:10:51 +0000 | [diff] [blame] | 435 | if (SkShader::kClamp_TileMode == radialGradient.fTileMode) { |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 436 | shadeProc = shadeSpan_radial_clamp; |
commit-bot@chromium.org | 87fcd95 | 2014-04-23 19:10:51 +0000 | [diff] [blame] | 437 | } else if (SkShader::kMirror_TileMode == radialGradient.fTileMode) { |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 438 | shadeProc = shadeSpan_radial_mirror; |
| 439 | } else { |
commit-bot@chromium.org | 87fcd95 | 2014-04-23 19:10:51 +0000 | [diff] [blame] | 440 | SkASSERT(SkShader::kRepeat_TileMode == radialGradient.fTileMode); |
rileya@google.com | 589708b | 2012-07-26 20:04:23 +0000 | [diff] [blame] | 441 | } |
| 442 | (*shadeProc)(srcPt.fX, sdx, srcPt.fY, sdy, dstC, cache, count, toggle); |
| 443 | } else { // perspective case |
| 444 | SkScalar dstX = SkIntToScalar(x); |
| 445 | SkScalar dstY = SkIntToScalar(y); |
| 446 | do { |
| 447 | dstProc(fDstToIndex, dstX, dstY, &srcPt); |
| 448 | unsigned fi = proc(SkScalarToFixed(srcPt.length())); |
| 449 | SkASSERT(fi <= 0xFFFF); |
| 450 | *dstC++ = cache[fi >> SkGradientShaderBase::kCache32Shift]; |
| 451 | dstX += SK_Scalar1; |
| 452 | } while (--count != 0); |
| 453 | } |
| 454 | } |
| 455 | |
rileya@google.com | d7cc651 | 2012-07-27 14:00:39 +0000 | [diff] [blame] | 456 | ///////////////////////////////////////////////////////////////////// |
| 457 | |
bsalomon@google.com | cf8fb1f | 2012-08-02 14:03:32 +0000 | [diff] [blame] | 458 | #if SK_SUPPORT_GPU |
| 459 | |
bsalomon@google.com | 2eaaefd | 2012-10-29 19:51:22 +0000 | [diff] [blame] | 460 | #include "GrTBackendEffectFactory.h" |
dandov | 9de5b51 | 2014-06-10 14:38:28 -0700 | [diff] [blame] | 461 | #include "SkGr.h" |
bsalomon@google.com | 2eaaefd | 2012-10-29 19:51:22 +0000 | [diff] [blame] | 462 | |
bsalomon@google.com | 0707c29 | 2012-10-25 21:45:42 +0000 | [diff] [blame] | 463 | class GrGLRadialGradient : public GrGLGradientEffect { |
rileya@google.com | d7cc651 | 2012-07-27 14:00:39 +0000 | [diff] [blame] | 464 | public: |
| 465 | |
bsalomon@google.com | 396e61f | 2012-10-25 19:00:29 +0000 | [diff] [blame] | 466 | GrGLRadialGradient(const GrBackendEffectFactory& factory, |
bsalomon@google.com | c781888 | 2013-03-20 19:19:53 +0000 | [diff] [blame] | 467 | const GrDrawEffect&) : INHERITED (factory) { } |
rileya@google.com | d7cc651 | 2012-07-27 14:00:39 +0000 | [diff] [blame] | 468 | virtual ~GrGLRadialGradient() { } |
| 469 | |
bsalomon@google.com | f78df33 | 2012-10-29 12:43:38 +0000 | [diff] [blame] | 470 | virtual void emitCode(GrGLShaderBuilder*, |
bsalomon@google.com | c781888 | 2013-03-20 19:19:53 +0000 | [diff] [blame] | 471 | const GrDrawEffect&, |
bsalomon@google.com | f78df33 | 2012-10-29 12:43:38 +0000 | [diff] [blame] | 472 | EffectKey, |
bsalomon@google.com | f78df33 | 2012-10-29 12:43:38 +0000 | [diff] [blame] | 473 | const char* outputColor, |
| 474 | const char* inputColor, |
bsalomon@google.com | 77af680 | 2013-10-02 13:04:56 +0000 | [diff] [blame] | 475 | const TransformedCoordsArray&, |
bsalomon@google.com | f78df33 | 2012-10-29 12:43:38 +0000 | [diff] [blame] | 476 | const TextureSamplerArray&) SK_OVERRIDE; |
rileya@google.com | d7cc651 | 2012-07-27 14:00:39 +0000 | [diff] [blame] | 477 | |
bsalomon@google.com | c781888 | 2013-03-20 19:19:53 +0000 | [diff] [blame] | 478 | static EffectKey GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&) { |
bsalomon@google.com | 82d1223 | 2013-09-09 15:36:26 +0000 | [diff] [blame] | 479 | return GenBaseGradientKey(drawEffect); |
bsalomon@google.com | d8b5fac | 2012-11-01 17:02:46 +0000 | [diff] [blame] | 480 | } |
rileya@google.com | d7cc651 | 2012-07-27 14:00:39 +0000 | [diff] [blame] | 481 | |
| 482 | private: |
| 483 | |
bsalomon@google.com | 0707c29 | 2012-10-25 21:45:42 +0000 | [diff] [blame] | 484 | typedef GrGLGradientEffect INHERITED; |
rileya@google.com | d7cc651 | 2012-07-27 14:00:39 +0000 | [diff] [blame] | 485 | |
| 486 | }; |
| 487 | |
rileya@google.com | 98e8b6d | 2012-07-31 20:38:06 +0000 | [diff] [blame] | 488 | ///////////////////////////////////////////////////////////////////// |
| 489 | |
| 490 | class GrRadialGradient : public GrGradientEffect { |
| 491 | public: |
bsalomon | 83d081a | 2014-07-08 09:56:10 -0700 | [diff] [blame^] | 492 | static GrEffect* Create(GrContext* ctx, |
| 493 | const SkRadialGradient& shader, |
| 494 | const SkMatrix& matrix, |
| 495 | SkShader::TileMode tm) { |
bsalomon | 55fad7a | 2014-07-08 07:34:20 -0700 | [diff] [blame] | 496 | return SkNEW_ARGS(GrRadialGradient, (ctx, shader, matrix, tm)); |
rileya@google.com | 98e8b6d | 2012-07-31 20:38:06 +0000 | [diff] [blame] | 497 | } |
| 498 | |
| 499 | virtual ~GrRadialGradient() { } |
| 500 | |
| 501 | static const char* Name() { return "Radial Gradient"; } |
bsalomon@google.com | 396e61f | 2012-10-25 19:00:29 +0000 | [diff] [blame] | 502 | virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE { |
| 503 | return GrTBackendEffectFactory<GrRadialGradient>::getInstance(); |
rileya@google.com | 98e8b6d | 2012-07-31 20:38:06 +0000 | [diff] [blame] | 504 | } |
| 505 | |
bsalomon@google.com | 422e81a | 2012-10-25 14:11:03 +0000 | [diff] [blame] | 506 | typedef GrGLRadialGradient GLEffect; |
rileya@google.com | 98e8b6d | 2012-07-31 20:38:06 +0000 | [diff] [blame] | 507 | |
| 508 | private: |
bsalomon@google.com | 0ac6af4 | 2013-01-16 15:16:18 +0000 | [diff] [blame] | 509 | GrRadialGradient(GrContext* ctx, |
| 510 | const SkRadialGradient& shader, |
| 511 | const SkMatrix& matrix, |
| 512 | SkShader::TileMode tm) |
| 513 | : INHERITED(ctx, shader, matrix, tm) { |
| 514 | } |
| 515 | |
bsalomon@google.com | f271cc7 | 2012-10-24 19:35:13 +0000 | [diff] [blame] | 516 | GR_DECLARE_EFFECT_TEST; |
rileya@google.com | 98e8b6d | 2012-07-31 20:38:06 +0000 | [diff] [blame] | 517 | |
| 518 | typedef GrGradientEffect INHERITED; |
| 519 | }; |
| 520 | |
| 521 | ///////////////////////////////////////////////////////////////////// |
| 522 | |
bsalomon@google.com | f271cc7 | 2012-10-24 19:35:13 +0000 | [diff] [blame] | 523 | GR_DEFINE_EFFECT_TEST(GrRadialGradient); |
bsalomon@google.com | d472620 | 2012-08-03 14:34:46 +0000 | [diff] [blame] | 524 | |
bsalomon | 83d081a | 2014-07-08 09:56:10 -0700 | [diff] [blame^] | 525 | GrEffect* GrRadialGradient::TestCreate(SkRandom* random, |
| 526 | GrContext* context, |
| 527 | const GrDrawTargetCaps&, |
| 528 | GrTexture**) { |
bsalomon@google.com | d472620 | 2012-08-03 14:34:46 +0000 | [diff] [blame] | 529 | SkPoint center = {random->nextUScalar1(), random->nextUScalar1()}; |
| 530 | SkScalar radius = random->nextUScalar1(); |
| 531 | |
| 532 | SkColor colors[kMaxRandomGradientColors]; |
| 533 | SkScalar stopsArray[kMaxRandomGradientColors]; |
| 534 | SkScalar* stops = stopsArray; |
| 535 | SkShader::TileMode tm; |
| 536 | int colorCount = RandomGradientParams(random, colors, &stops, &tm); |
| 537 | SkAutoTUnref<SkShader> shader(SkGradientShader::CreateRadial(center, radius, |
| 538 | colors, stops, colorCount, |
| 539 | tm)); |
bsalomon@google.com | e197cbf | 2013-01-14 16:46:26 +0000 | [diff] [blame] | 540 | SkPaint paint; |
bsalomon | 83d081a | 2014-07-08 09:56:10 -0700 | [diff] [blame^] | 541 | GrColor paintColor; |
| 542 | GrEffect* effect; |
| 543 | SkAssertResult(shader->asNewEffect(context, paint, NULL, &paintColor, &effect)); |
dandov | 9de5b51 | 2014-06-10 14:38:28 -0700 | [diff] [blame] | 544 | return effect; |
bsalomon@google.com | d472620 | 2012-08-03 14:34:46 +0000 | [diff] [blame] | 545 | } |
| 546 | |
| 547 | ///////////////////////////////////////////////////////////////////// |
| 548 | |
bsalomon@google.com | f78df33 | 2012-10-29 12:43:38 +0000 | [diff] [blame] | 549 | void GrGLRadialGradient::emitCode(GrGLShaderBuilder* builder, |
bsalomon@google.com | c781888 | 2013-03-20 19:19:53 +0000 | [diff] [blame] | 550 | const GrDrawEffect&, |
bsalomon@google.com | d8b5fac | 2012-11-01 17:02:46 +0000 | [diff] [blame] | 551 | EffectKey key, |
bsalomon@google.com | f78df33 | 2012-10-29 12:43:38 +0000 | [diff] [blame] | 552 | const char* outputColor, |
| 553 | const char* inputColor, |
bsalomon@google.com | 77af680 | 2013-10-02 13:04:56 +0000 | [diff] [blame] | 554 | const TransformedCoordsArray& coords, |
bsalomon@google.com | f78df33 | 2012-10-29 12:43:38 +0000 | [diff] [blame] | 555 | const TextureSamplerArray& samplers) { |
bsalomon@google.com | 82d1223 | 2013-09-09 15:36:26 +0000 | [diff] [blame] | 556 | this->emitUniforms(builder, key); |
bsalomon@google.com | d8b5fac | 2012-11-01 17:02:46 +0000 | [diff] [blame] | 557 | SkString t("length("); |
bsalomon@google.com | 77af680 | 2013-10-02 13:04:56 +0000 | [diff] [blame] | 558 | t.append(builder->ensureFSCoords2D(coords, 0)); |
bsalomon@google.com | d8b5fac | 2012-11-01 17:02:46 +0000 | [diff] [blame] | 559 | t.append(")"); |
bsalomon@google.com | 82d1223 | 2013-09-09 15:36:26 +0000 | [diff] [blame] | 560 | this->emitColor(builder, t.c_str(), key, outputColor, inputColor, samplers); |
rileya@google.com | d7cc651 | 2012-07-27 14:00:39 +0000 | [diff] [blame] | 561 | } |
| 562 | |
rileya@google.com | d7cc651 | 2012-07-27 14:00:39 +0000 | [diff] [blame] | 563 | ///////////////////////////////////////////////////////////////////// |
| 564 | |
dandov | 9de5b51 | 2014-06-10 14:38:28 -0700 | [diff] [blame] | 565 | bool SkRadialGradient::asNewEffect(GrContext* context, const SkPaint& paint, |
bsalomon | 83d081a | 2014-07-08 09:56:10 -0700 | [diff] [blame^] | 566 | const SkMatrix* localMatrix, GrColor* paintColor, |
| 567 | GrEffect** effect) const { |
bsalomon@google.com | 00835cc | 2013-01-14 17:07:22 +0000 | [diff] [blame] | 568 | SkASSERT(NULL != context); |
dandov | 9de5b51 | 2014-06-10 14:38:28 -0700 | [diff] [blame] | 569 | |
bsalomon@google.com | dfdb7e5 | 2012-10-16 15:19:45 +0000 | [diff] [blame] | 570 | SkMatrix matrix; |
bsalomon@google.com | f94b3a4 | 2012-10-31 18:09:01 +0000 | [diff] [blame] | 571 | if (!this->getLocalMatrix().invert(&matrix)) { |
dandov | 9de5b51 | 2014-06-10 14:38:28 -0700 | [diff] [blame] | 572 | return false; |
bsalomon@google.com | dfdb7e5 | 2012-10-16 15:19:45 +0000 | [diff] [blame] | 573 | } |
commit-bot@chromium.org | 96fb748 | 2014-05-09 20:28:11 +0000 | [diff] [blame] | 574 | if (localMatrix) { |
| 575 | SkMatrix inv; |
| 576 | if (!localMatrix->invert(&inv)) { |
dandov | 9de5b51 | 2014-06-10 14:38:28 -0700 | [diff] [blame] | 577 | return false; |
commit-bot@chromium.org | 96fb748 | 2014-05-09 20:28:11 +0000 | [diff] [blame] | 578 | } |
| 579 | matrix.postConcat(inv); |
| 580 | } |
bsalomon@google.com | f94b3a4 | 2012-10-31 18:09:01 +0000 | [diff] [blame] | 581 | matrix.postConcat(fPtsToUnit); |
dandov | 9de5b51 | 2014-06-10 14:38:28 -0700 | [diff] [blame] | 582 | |
bsalomon | 83d081a | 2014-07-08 09:56:10 -0700 | [diff] [blame^] | 583 | *paintColor = SkColor2GrColorJustAlpha(paint.getColor()); |
| 584 | *effect = GrRadialGradient::Create(context, *this, matrix, fTileMode); |
dandov | 9de5b51 | 2014-06-10 14:38:28 -0700 | [diff] [blame] | 585 | |
| 586 | return true; |
rileya@google.com | d7cc651 | 2012-07-27 14:00:39 +0000 | [diff] [blame] | 587 | } |
| 588 | |
bsalomon@google.com | cf8fb1f | 2012-08-02 14:03:32 +0000 | [diff] [blame] | 589 | #else |
| 590 | |
dandov | 9de5b51 | 2014-06-10 14:38:28 -0700 | [diff] [blame] | 591 | bool SkRadialGradient::asNewEffect(GrContext* context, const SkPaint& paint, |
bsalomon | 83d081a | 2014-07-08 09:56:10 -0700 | [diff] [blame^] | 592 | const SkMatrix* localMatrix, GrColor* paintColor, |
| 593 | GrEffect** effect) const { |
bsalomon@google.com | cf8fb1f | 2012-08-02 14:03:32 +0000 | [diff] [blame] | 594 | SkDEBUGFAIL("Should not call in GPU-less build"); |
dandov | 9de5b51 | 2014-06-10 14:38:28 -0700 | [diff] [blame] | 595 | return false; |
bsalomon@google.com | cf8fb1f | 2012-08-02 14:03:32 +0000 | [diff] [blame] | 596 | } |
| 597 | |
| 598 | #endif |
robertphillips@google.com | 76f9e93 | 2013-01-15 20:17:47 +0000 | [diff] [blame] | 599 | |
commit-bot@chromium.org | 0f10f7b | 2014-03-13 18:02:17 +0000 | [diff] [blame] | 600 | #ifndef SK_IGNORE_TO_STRING |
robertphillips@google.com | 76f9e93 | 2013-01-15 20:17:47 +0000 | [diff] [blame] | 601 | void SkRadialGradient::toString(SkString* str) const { |
| 602 | str->append("SkRadialGradient: ("); |
skia.committer@gmail.com | ff21c2e | 2013-01-16 07:05:56 +0000 | [diff] [blame] | 603 | |
robertphillips@google.com | 76f9e93 | 2013-01-15 20:17:47 +0000 | [diff] [blame] | 604 | str->append("center: ("); |
| 605 | str->appendScalar(fCenter.fX); |
| 606 | str->append(", "); |
| 607 | str->appendScalar(fCenter.fY); |
| 608 | str->append(") radius: "); |
| 609 | str->appendScalar(fRadius); |
| 610 | str->append(" "); |
| 611 | |
| 612 | this->INHERITED::toString(str); |
| 613 | |
| 614 | str->append(")"); |
| 615 | } |
| 616 | #endif |