diff options
author | Brian Osman <brianosman@google.com> | 2017-03-04 08:12:46 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-04 13:49:47 +0000 |
commit | 32342f032e1dfd133040324f851f0365f9d4cb51 (patch) | |
tree | 56cc2ae886ef068ff0ebb13a22c9357b40cdc6dd /src/gpu/effects/GrTextureDomain.cpp | |
parent | ae9718f1d40556ed5a49e616dbe54087f4d0d546 (diff) |
Rebase and fix chromium
Combine texture provider and resource provider
Largely mechanical. Only three places that were calling createApprox
via texture provider (ie without flags), so that was simple.
BUG=skia:
Change-Id: I876367bcdc6a8db736deedab1028de1972015509
Reviewed-on: https://skia-review.googlesource.com/9176
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/effects/GrTextureDomain.cpp')
-rw-r--r-- | src/gpu/effects/GrTextureDomain.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp index 39bc3ccb8a..2ac6af8375 100644 --- a/src/gpu/effects/GrTextureDomain.cpp +++ b/src/gpu/effects/GrTextureDomain.cpp @@ -423,7 +423,7 @@ GrDeviceSpaceTextureDecalFragmentProcessor::GrDeviceSpaceTextureDecalFragmentPro const SkIRect& subset, const SkIPoint& deviceSpaceOffset) : INHERITED(kCompatibleWithCoverageAsAlpha_OptimizationFlag) - , fTextureSampler(context->textureProvider(), proxy, GrSamplerParams::ClampNoFilter()) + , fTextureSampler(context->resourceProvider(), proxy, GrSamplerParams::ClampNoFilter()) , fTextureDomain(proxy.get(), GrTextureDomain::MakeTexelDomain(subset), GrTextureDomain::kDecal_Mode) { this->addTextureSampler(&fTextureSampler); |