void highQualityFilter_SSE2(const SkBitmapProcState& s, int x, int y,
SkPMColor* SK_RESTRICT colors, int count) {
- const int maxX = s.fBitmap->width() - 1;
- const int maxY = s.fBitmap->height() - 1;
+ const int maxX = s.fBitmap->width();
+ const int maxY = s.fBitmap->height();
+ SkAutoTMalloc<SkScalar> xWeights(maxX);
while (count-- > 0) {
SkPoint srcPt;
- s.fInvProc(s.fInvMatrix, SkIntToScalar(x),
- SkIntToScalar(y), &srcPt);
+ s.fInvProc(s.fInvMatrix, x + 0.5f, y + 0.5f, &srcPt);
srcPt.fX -= SK_ScalarHalf;
srcPt.fY -= SK_ScalarHalf;
- int sx = SkScalarFloorToInt(srcPt.fX);
- int sy = SkScalarFloorToInt(srcPt.fY);
-
__m128 weight = _mm_setzero_ps();
__m128 accum = _mm_setzero_ps();
- int y0 = SkTMax(0, int(ceil(sy-s.getBitmapFilter()->width() + 0.5f)));
- int y1 = SkTMin(maxY, int(floor(sy+s.getBitmapFilter()->width() + 0.5f)));
- int x0 = SkTMax(0, int(ceil(sx-s.getBitmapFilter()->width() + 0.5f)));
- int x1 = SkTMin(maxX, int(floor(sx+s.getBitmapFilter()->width() + 0.5f)));
+ int y0 = SkClampMax(SkScalarCeilToInt(srcPt.fY-s.getBitmapFilter()->width()), maxY);
+ int y1 = SkClampMax(SkScalarFloorToInt(srcPt.fY+s.getBitmapFilter()->width()+1), maxY);
+ int x0 = SkClampMax(SkScalarCeilToInt(srcPt.fX-s.getBitmapFilter()->width()), maxX);
+ int x1 = SkClampMax(SkScalarFloorToInt(srcPt.fX+s.getBitmapFilter()->width())+1, maxX);
+
+ for (int srcX = x0; srcX < x1 ; srcX++) {
+ // Looking these up once instead of each loop is a ~15% speedup.
+ xWeights[srcX - x0] = s.getBitmapFilter()->lookupScalar((srcPt.fX - srcX));
+ }
- for (int src_y = y0; src_y <= y1; src_y++) {
- float yweight = SkScalarToFloat(s.getBitmapFilter()->lookupScalar(srcPt.fY - src_y));
+ for (int srcY = y0; srcY < y1; srcY++) {
+ SkScalar yWeight = s.getBitmapFilter()->lookupScalar((srcPt.fY - srcY));
- for (int src_x = x0; src_x <= x1 ; src_x++) {
- float xweight = SkScalarToFloat(s.getBitmapFilter()->lookupScalar(srcPt.fX - src_x));
+ for (int srcX = x0; srcX < x1 ; srcX++) {
+ SkScalar xWeight = xWeights[srcX - x0];
- float combined_weight = xweight * yweight;
+ SkScalar combined_weight = SkScalarMul(xWeight, yWeight);
- SkPMColor color = *s.fBitmap->getAddr32(src_x, src_y);
+ SkPMColor color = *s.fBitmap->getAddr32(srcX, srcY);
- __m128i c = _mm_cvtsi32_si128( color );
+ __m128i c = _mm_cvtsi32_si128(color);
c = _mm_unpacklo_epi8(c, _mm_setzero_si128());
c = _mm_unpacklo_epi16(c, _mm_setzero_si128());
-
- __m128 cfloat = _mm_cvtepi32_ps( c );
+ __m128 cfloat = _mm_cvtepi32_ps(c);
__m128 weightVector = _mm_set1_ps(combined_weight);
-
accum = _mm_add_ps(accum, _mm_mul_ps(cfloat, weightVector));
weight = _mm_add_ps( weight, weightVector );
}
accum = _mm_div_ps(accum, weight);
accum = _mm_add_ps(accum, _mm_set1_ps(0.5f));
+ __m128i accumInt = _mm_cvttps_epi32(accum);
+ accumInt = _mm_packs_epi32(accumInt, _mm_setzero_si128());
+ accumInt = _mm_packus_epi16(accumInt, _mm_setzero_si128());
+ SkPMColor c = _mm_cvtsi128_si32(accumInt);
- __m128i accumInt = _mm_cvtps_epi32( accum );
-
- int localResult[4];
- _mm_storeu_si128((__m128i *) (localResult), accumInt);
- int a = SkClampMax(localResult[0], 255);
- int r = SkClampMax(localResult[1], a);
- int g = SkClampMax(localResult[2], a);
- int b = SkClampMax(localResult[3], a);
+ int a = SkClampMax(SkGetPackedA32(c), 255);
+ int r = SkClampMax(SkGetPackedR32(c), a);
+ int g = SkClampMax(SkGetPackedG32(c), a);
+ int b = SkClampMax(SkGetPackedB32(c), a);
*colors++ = SkPackARGB32(a, r, g, b);
}
}
-void highQualityFilter_ScaleOnly_SSE2(const SkBitmapProcState &s, int x, int y,
- SkPMColor *SK_RESTRICT colors, int count) {
- const int maxX = s.fBitmap->width() - 1;
- const int maxY = s.fBitmap->height() - 1;
-
- SkPoint srcPt;
- s.fInvProc(s.fInvMatrix, SkIntToScalar(x),
- SkIntToScalar(y), &srcPt);
- srcPt.fY -= SK_ScalarHalf;
- int sy = SkScalarFloorToInt(srcPt.fY);
-
- int y0 = SkTMax(0, int(ceil(sy-s.getBitmapFilter()->width() + 0.5f)));
- int y1 = SkTMin(maxY, int(floor(sy+s.getBitmapFilter()->width() + 0.5f)));
-
- while (count-- > 0) {
- srcPt.fX -= SK_ScalarHalf;
- srcPt.fY -= SK_ScalarHalf;
-
- int sx = SkScalarFloorToInt(srcPt.fX);
-
- float weight = 0;
- __m128 accum = _mm_setzero_ps();
-
- int x0 = SkTMax(0, int(ceil(sx-s.getBitmapFilter()->width() + 0.5f)));
- int x1 = SkTMin(maxX, int(floor(sx+s.getBitmapFilter()->width() + 0.5f)));
-
- for (int src_y = y0; src_y <= y1; src_y++) {
- float yweight = SkScalarToFloat(s.getBitmapFilter()->lookupScalar(srcPt.fY - src_y));
-
- for (int src_x = x0; src_x <= x1 ; src_x++) {
- float xweight = SkScalarToFloat(s.getBitmapFilter()->lookupScalar(srcPt.fX - src_x));
-
- float combined_weight = xweight * yweight;
-
- SkPMColor color = *s.fBitmap->getAddr32(src_x, src_y);
-
- __m128 c = _mm_set_ps((float)SkGetPackedB32(color),
- (float)SkGetPackedG32(color),
- (float)SkGetPackedR32(color),
- (float)SkGetPackedA32(color));
-
- __m128 weightVector = _mm_set1_ps(combined_weight);
-
- accum = _mm_add_ps(accum, _mm_mul_ps(c, weightVector));
- weight += combined_weight;
- }
- }
-
- __m128 totalWeightVector = _mm_set1_ps(weight);
- accum = _mm_div_ps(accum, totalWeightVector);
- accum = _mm_add_ps(accum, _mm_set1_ps(0.5f));
-
- float localResult[4];
- _mm_storeu_ps(localResult, accum);
- int a = SkClampMax(int(localResult[0]), 255);
- int r = SkClampMax(int(localResult[1]), a);
- int g = SkClampMax(int(localResult[2]), a);
- int b = SkClampMax(int(localResult[3]), a);
-
- *colors++ = SkPackARGB32(a, r, g, b);
-
- x++;
-
- s.fInvProc(s.fInvMatrix, SkIntToScalar(x),
- SkIntToScalar(y), &srcPt);
- }
-}
-
// Convolves horizontally along a single row. The row data is given in
// |src_data| and continues for the num_values() of the filter.
void convolveHorizontally_SSE2(const unsigned char* src_data,
projects / platform / framework / web / crosswalk.git / blobdiff