diff options
| author |  bsalomon <bsalomon@google.com> | 2014-10-27 12:59:03 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-27 12:59:03 -0700 |
| commit | a9a80e5f427e02efe7289f3784cf047d12a0b5bd (patch) | |
| tree | 8079a3933273a4662cb1cc158c6b6d41fb96f61d | |
| parent | c6327a8f7e7e282c0b3a95049c75db7a8f92c693 (diff) | |
Revert of Use approximate scratch textures for image filters. (patchset #1 id:1 of https://codereview.chromium.org/679113004/)
Reason for revert:
Images change on some machines. Mostly look OK but not sure about imagefiltersbase on N5.
Old"
http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/imagefiltersbase/11449357083048653160.png
New:
http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/imagefiltersbase/14279906119350384263.png
Original issue's description:
> Use approximate scratch textures for image filters.
>
> Committed: https://skia.googlesource.com/skia/+/96c60686eef6fc514feba6136f1b475f71dbf3ec
TBR=senorblanco@google.com,senorblanco@chromium.org
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/664823003
| -rw-r--r-- | src/gpu/SkGpuDevice.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
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)); |