aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--expectations/gm/ignored-tests.txt20
-rw-r--r--src/gpu/SkGpuDevice.cpp12
2 files changed, 5 insertions, 27 deletions
diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt
index 2034808b6b..1499accc4a 100644
--- a/expectations/gm/ignored-tests.txt
+++ b/expectations/gm/ignored-tests.txt
@@ -40,26 +40,6 @@ blurrects
# New shadow only option in SkDropShadowImageFilter
dropshadowimagefilter
-# bsalomon https://codereview.chromium.org/679113004/
-# subtle changes to image filters by using approx match scratch textures
-offsetimagefilter
-xfermodeimagefilter
-matrixconvolution
-imagefilterscropexpand
-imagefiltersgraph
-imagefiltersscaled
-pictureimagefilter
-testimagefilters
-imagefilterscropped
-matriximagefilter
-imagefiltersclipped
-resizeimagefilter
-displacement
-imageblur
-imageblur2
-imageblur_large
-spritebitmap
-
# senorblanco https://codereview.chromium.org/637283009/
# quality improvements to imagemagnifier GM
imagemagnifier
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 096b848ab0..07b7f75e92 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -1763,13 +1763,11 @@ SkBaseDevice* SkGpuDevice::onCreateDevice(const SkImageInfo& info, Usage usage)
unsigned flags = info.isOpaque() ? 0 : kNeedClear_Flag;
#if CACHE_COMPATIBLE_DEVICE_TEXTURES
- // layers are never draw in repeat modes or with mip maps, so we can request an approx
- // match and ignore any padding. Image filters (at present) don't tile their inputs or use mip
- // maps, either.
- const GrContext::ScratchTexMatch match =
- (kSaveLayer_Usage == usage || kImageFilter_Usage == usage) ?
- GrContext::kApprox_ScratchTexMatch :
- GrContext::kExact_ScratchTexMatch;
+ // layers are never draw in repeat modes, so we can request an approx
+ // match and ignore any padding.
+ const GrContext::ScratchTexMatch match = (kSaveLayer_Usage == usage) ?
+ GrContext::kApprox_ScratchTexMatch :
+ GrContext::kExact_ScratchTexMatch;
texture.reset(fContext->refScratchTexture(desc, match));
#else
texture.reset(fContext->createUncachedTexture(desc, NULL, 0));