| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2011 Google Inc. | 2 * Copyright 2011 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "SkMathPriv.h" | 8 #include "SkMathPriv.h" |
| 9 | 9 |
| 10 #define SCALE_FILTER_NAME MAKENAME(_filter_DX_shaderproc) | 10 #define SCALE_FILTER_NAME MAKENAME(_filter_DX_shaderproc) |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 const unsigned maxX = s.fPixmap.width() - 1; | 25 const unsigned maxX = s.fPixmap.width() - 1; |
| 26 const SkFixed oneX = s.fFilterOneX; | 26 const SkFixed oneX = s.fFilterOneX; |
| 27 const SkFixed dx = s.fInvSx; | 27 const SkFixed dx = s.fInvSx; |
| 28 SkFixed fx; | 28 SkFixed fx; |
| 29 const SRCTYPE* SK_RESTRICT row0; | 29 const SRCTYPE* SK_RESTRICT row0; |
| 30 const SRCTYPE* SK_RESTRICT row1; | 30 const SRCTYPE* SK_RESTRICT row1; |
| 31 unsigned subY; | 31 unsigned subY; |
| 32 | 32 |
| 33 { | 33 { |
| 34 const SkBitmapProcStateAutoMapper mapper(s, x, y); | 34 const SkBitmapProcStateAutoMapper mapper(s, x, y); |
| 35 SkFixed fy = SkFractionalIntToFixed(mapper.y()); | 35 SkFixed fy = mapper.fixedY(); |
| 36 const unsigned maxY = s.fPixmap.height() - 1; | 36 const unsigned maxY = s.fPixmap.height() - 1; |
| 37 // compute our two Y values up front | 37 // compute our two Y values up front |
| 38 subY = TILEY_LOW_BITS(fy, maxY); | 38 subY = TILEY_LOW_BITS(fy, maxY); |
| 39 int y0 = TILEY_PROCF(fy, maxY); | 39 int y0 = TILEY_PROCF(fy, maxY); |
| 40 int y1 = TILEY_PROCF((fy + s.fFilterOneY), maxY); | 40 int y1 = TILEY_PROCF((fy + s.fFilterOneY), maxY); |
| 41 | 41 |
| 42 const char* SK_RESTRICT srcAddr = (const char*)s.fPixmap.addr(); | 42 const char* SK_RESTRICT srcAddr = (const char*)s.fPixmap.addr(); |
| 43 size_t rb = s.fPixmap.rowBytes(); | 43 size_t rb = s.fPixmap.rowBytes(); |
| 44 row0 = (const SRCTYPE*)(srcAddr + y0 * rb); | 44 row0 = (const SRCTYPE*)(srcAddr + y0 * rb); |
| 45 row1 = (const SRCTYPE*)(srcAddr + y1 * rb); | 45 row1 = (const SRCTYPE*)(srcAddr + y1 * rb); |
| 46 // now initialize fx | 46 // now initialize fx |
| 47 fx = SkFractionalIntToFixed(mapper.x()); | 47 fx = mapper.fixedX(); |
| 48 } | 48 } |
| 49 | 49 |
| 50 #ifdef PREAMBLE | 50 #ifdef PREAMBLE |
| 51 PREAMBLE(s); | 51 PREAMBLE(s); |
| 52 #endif | 52 #endif |
| 53 | 53 |
| 54 do { | 54 do { |
| 55 unsigned subX = TILEX_LOW_BITS(fx, maxX); | 55 unsigned subX = TILEX_LOW_BITS(fx, maxX); |
| 56 unsigned x0 = TILEX_PROCF(fx, maxX); | 56 unsigned x0 = TILEX_PROCF(fx, maxX); |
| 57 unsigned x1 = TILEX_PROCF((fx + oneX), maxX); | 57 unsigned x1 = TILEX_PROCF((fx + oneX), maxX); |
| (...skipping 22 matching lines...) Expand all Loading... |
| 80 #undef TILEY_LOW_BITS | 80 #undef TILEY_LOW_BITS |
| 81 #undef MAKENAME | 81 #undef MAKENAME |
| 82 #undef SRCTYPE | 82 #undef SRCTYPE |
| 83 #undef CHECKSTATE | 83 #undef CHECKSTATE |
| 84 #undef SRC_TO_FILTER | 84 #undef SRC_TO_FILTER |
| 85 #undef FILTER_TO_DST | 85 #undef FILTER_TO_DST |
| 86 #undef PREAMBLE | 86 #undef PREAMBLE |
| 87 #undef POSTAMBLE | 87 #undef POSTAMBLE |
| 88 | 88 |
| 89 #undef SCALE_FILTER_NAME | 89 #undef SCALE_FILTER_NAME |
| OLD | NEW |