Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2210)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/effects/SkLightingImageFilter.cpp

Issue 1701133002: Remove 6-param applyCropRect() from lighting filters (raster path). (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix another 100-col issue Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« gm/imagefilterscropexpand.cpp ('K') | « gm/imagefilterscropexpand.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/effects/SkLightingImageFilter.cpp
diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp
index 19da3ed5e8fa2389e6760ae67ba45ec9bec850d3..d2e7a9a9b827341e5ee5c23735d2127f096a1015 100644
--- a/src/effects/SkLightingImageFilter.cpp
+++ b/src/effects/SkLightingImageFilter.cpp
@@ -185,35 +185,54 @@ inline SkPoint3 bottomRightNormal(int m[9], SkScalar surfaceScale) {
surfaceScale);
}
-template <class LightingType, class LightType> void lightBitmap(const LightingType& lightingType,
- const SkImageFilterLight* light,
- const SkBitmap& src,
- SkBitmap* dst,
- SkScalar surfaceScale,
- const SkIRect& bounds) {
+
+class UncheckedPixelFetcher {
+public:
robertphillips 2016/02/16 20:19:46 Fetch ?
Stephen White 2016/02/16 20:54:08 Done.
+ static inline uint32_t fetch(const SkBitmap& src, int x, int y, const SkIRect& bounds) {
+ return SkGetPackedA32(*src.getAddr32(x, y));
+ }
+};
+
robertphillips 2016/02/16 20:19:46 // The DecalPixelFetcher is used to implement the
Stephen White 2016/02/16 20:54:08 Almost; done. :)
+class DecalPixelFetcher {
+public:
robertphillips 2016/02/16 20:19:46 Fetch ?
Stephen White 2016/02/16 20:54:08 Done.
+ static inline uint32_t fetch(const SkBitmap& src, int x, int y, const SkIRect& bounds) {
+ if (x < bounds.fLeft || x >= bounds.fRight || y < bounds.fTop || y >= bounds.fBottom) {
+ return 0;
+ } else {
+ return SkGetPackedA32(*src.getAddr32(x, y));
+ }
+ }
+};
+
+template <class LightingType, class LightType, class PixelFetcher>
+void lightBitmap(const LightingType& lightingType,
+ const SkImageFilterLight* light,
+ const SkBitmap& src,
+ SkBitmap* dst,
+ SkScalar surfaceScale,
+ const SkIRect& bounds) {
SkASSERT(dst->width() == bounds.width() && dst->height() == bounds.height());
const LightType* l = static_cast<const LightType*>(light);
int left = bounds.left(), right = bounds.right();
int bottom = bounds.bottom();
int y = bounds.top();
+ SkIRect srcBounds = src.bounds();
SkPMColor* dptr = dst->getAddr32(0, 0);
{
int x = left;
- const SkPMColor* row1 = src.getAddr32(x, y);
- const SkPMColor* row2 = src.getAddr32(x, y + 1);
int m[9];
- m[4] = SkGetPackedA32(*row1++);
- m[5] = SkGetPackedA32(*row1++);
- m[7] = SkGetPackedA32(*row2++);
- m[8] = SkGetPackedA32(*row2++);
+ m[4] = PixelFetcher::fetch(src, x, y, srcBounds);
+ m[5] = PixelFetcher::fetch(src, x + 1, y, srcBounds);
+ m[7] = PixelFetcher::fetch(src, x, y + 1, srcBounds);
+ m[8] = PixelFetcher::fetch(src, x + 1, y + 1, srcBounds);
SkPoint3 surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);
*dptr++ = lightingType.light(topLeftNormal(m, surfaceScale), surfaceToLight,
l->lightColor(surfaceToLight));
for (++x; x < right - 1; ++x)
{
shiftMatrixLeft(m);
- m[5] = SkGetPackedA32(*row1++);
- m[8] = SkGetPackedA32(*row2++);
+ m[5] = PixelFetcher::fetch(src, x + 1, y, srcBounds);
+ m[8] = PixelFetcher::fetch(src, x + 1, y + 1, srcBounds);
surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);
*dptr++ = lightingType.light(topNormal(m, surfaceScale), surfaceToLight,
l->lightColor(surfaceToLight));
@@ -226,24 +245,21 @@ template <class LightingType, class LightType> void lightBitmap(const LightingTy
for (++y; y < bottom - 1; ++y) {
int x = left;
- const SkPMColor* row0 = src.getAddr32(x, y - 1);
- const SkPMColor* row1 = src.getAddr32(x, y);
- const SkPMColor* row2 = src.getAddr32(x, y + 1);
int m[9];
- m[1] = SkGetPackedA32(*row0++);
- m[2] = SkGetPackedA32(*row0++);
- m[4] = SkGetPackedA32(*row1++);
- m[5] = SkGetPackedA32(*row1++);
- m[7] = SkGetPackedA32(*row2++);
- m[8] = SkGetPackedA32(*row2++);
+ m[1] = PixelFetcher::fetch(src, x, y - 1, srcBounds);
+ m[2] = PixelFetcher::fetch(src, x + 1, y - 1, srcBounds);
+ m[4] = PixelFetcher::fetch(src, x, y, srcBounds);
+ m[5] = PixelFetcher::fetch(src, x + 1, y, srcBounds);
+ m[7] = PixelFetcher::fetch(src, x, y + 1, srcBounds);
+ m[8] = PixelFetcher::fetch(src, x + 1, y + 1, srcBounds);
SkPoint3 surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);
*dptr++ = lightingType.light(leftNormal(m, surfaceScale), surfaceToLight,
l->lightColor(surfaceToLight));
for (++x; x < right - 1; ++x) {
shiftMatrixLeft(m);
- m[2] = SkGetPackedA32(*row0++);
- m[5] = SkGetPackedA32(*row1++);
- m[8] = SkGetPackedA32(*row2++);
+ m[2] = PixelFetcher::fetch(src, x + 1, y - 1, srcBounds);
+ m[5] = PixelFetcher::fetch(src, x + 1, y, srcBounds);
+ m[8] = PixelFetcher::fetch(src, x + 1, y + 1, srcBounds);
surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);
*dptr++ = lightingType.light(interiorNormal(m, surfaceScale), surfaceToLight,
l->lightColor(surfaceToLight));
@@ -256,21 +272,19 @@ template <class LightingType, class LightType> void lightBitmap(const LightingTy
{
int x = left;
- const SkPMColor* row0 = src.getAddr32(x, bottom - 2);
- const SkPMColor* row1 = src.getAddr32(x, bottom - 1);
int m[9];
- m[1] = SkGetPackedA32(*row0++);
- m[2] = SkGetPackedA32(*row0++);
- m[4] = SkGetPackedA32(*row1++);
- m[5] = SkGetPackedA32(*row1++);
+ m[1] = PixelFetcher::fetch(src, x, bottom - 2, srcBounds);
+ m[2] = PixelFetcher::fetch(src, x + 1, bottom - 2, srcBounds);
+ m[4] = PixelFetcher::fetch(src, x, bottom - 1, srcBounds);
+ m[5] = PixelFetcher::fetch(src, x + 1, bottom - 1, srcBounds);
SkPoint3 surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);
*dptr++ = lightingType.light(bottomLeftNormal(m, surfaceScale), surfaceToLight,
l->lightColor(surfaceToLight));
for (++x; x < right - 1; ++x)
{
shiftMatrixLeft(m);
- m[2] = SkGetPackedA32(*row0++);
- m[5] = SkGetPackedA32(*row1++);
+ m[2] = PixelFetcher::fetch(src, x + 1, bottom - 2, srcBounds);
+ m[5] = PixelFetcher::fetch(src, x + 1, bottom - 1, srcBounds);
surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);
*dptr++ = lightingType.light(bottomNormal(m, surfaceScale), surfaceToLight,
l->lightColor(surfaceToLight));
@@ -282,6 +296,22 @@ template <class LightingType, class LightType> void lightBitmap(const LightingTy
}
}
+template <class LightingType, class LightType>
+void lightBitmap(const LightingType& lightingType,
+ const SkImageFilterLight* light,
+ const SkBitmap& src,
+ SkBitmap* dst,
+ SkScalar surfaceScale,
+ const SkIRect& bounds) {
+ if (src.bounds().contains(bounds)) {
+ lightBitmap<LightingType, LightType, UncheckedPixelFetcher>(
+ lightingType, light, src, dst, surfaceScale, bounds);
+ } else {
+ lightBitmap<LightingType, LightType, DecalPixelFetcher>(
+ lightingType, light, src, dst, surfaceScale, bounds);
+ }
+}
+
SkPoint3 readPoint3(SkReadBuffer& buffer) {
SkPoint3 point;
point.fX = buffer.readScalar();
@@ -1187,8 +1217,10 @@ bool SkDiffuseLightingImageFilter::onFilterImage(Proxy* proxy,
if (src.colorType() != kN32_SkColorType) {
return false;
}
+ SkIRect srcBounds = src.bounds();
+ srcBounds.offset(srcOffset);
SkIRect bounds;
- if (!this->applyCropRect(ctx, proxy, src, &srcOffset, &bounds, &src)) {
+ if (!this->applyCropRect(ctx, srcBounds, &bounds)) {
return false;
}
@@ -1331,8 +1363,10 @@ bool SkSpecularLightingImageFilter::onFilterImage(Proxy* proxy,
return false;
}
+ SkIRect srcBounds = src.bounds();
+ srcBounds.offset(srcOffset);
SkIRect bounds;
- if (!this->applyCropRect(ctx, proxy, src, &srcOffset, &bounds, &src)) {
+ if (!this->applyCropRect(ctx, srcBounds, &bounds)) {
return false;
}
« gm/imagefilterscropexpand.cpp ('K') | « gm/imagefilterscropexpand.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698